Enable PMD in gradle + apply fixes.

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

build.gradle

@@ -21,6 +21,7 @@ dependencies {
 
 allprojects {
     apply plugin: 'java'
+    apply plugin: 'pmd'
 
     sourceSets {
         main {
@@ -55,6 +56,11 @@ allprojects {
         testCompile group: 'junit', name: 'junit', version: '4.+'
         testCompile group: 'org.mockito', name: 'mockito-all', version: '1.+'
     }
+
+    pmd {
+        ruleSets = []
+        ruleSetFiles = files("$rootDir/etc/pmd/full.xml")
+    }
 }
 
 task wrapper(type: Wrapper) {

etc/pmd/full.xml

@@ -6,138 +6,137 @@
          xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
         <description>DMDirc minimal PMD checks.</description>
 
-<rule ref="rulesets/basic.xml/EmptyIfStmt"><priority>1</priority></rule>
-<rule ref="rulesets/basic.xml/EmptyWhileStmt"><priority>1</priority></rule>
-<rule ref="rulesets/basic.xml/EmptyTryBlock"><priority>1</priority></rule>
-<rule ref="rulesets/basic.xml/EmptyFinallyBlock"><priority>1</priority></rule>
-<rule ref="rulesets/basic.xml/EmptySwitchStatements"><priority>1</priority></rule>
-<rule ref="rulesets/basic.xml/JumbledIncrementer"><priority>1</priority></rule>
-<rule ref="rulesets/basic.xml/ForLoopShouldBeWhileLoop"><priority>1</priority></rule>
-<rule ref="rulesets/basic.xml/UnnecessaryConversionTemporary"><priority>1</priority></rule>
-<rule ref="rulesets/basic.xml/OverrideBothEqualsAndHashcode"><priority>1</priority></rule>
-<rule ref="rulesets/basic.xml/DoubleCheckedLocking"><priority>1</priority></rule>
-<rule ref="rulesets/basic.xml/ReturnFromFinallyBlock"><priority>1</priority></rule>
-<rule ref="rulesets/basic.xml/EmptySynchronizedBlock"><priority>1</priority></rule>
-<rule ref="rulesets/basic.xml/EmptyStaticInitializer"><priority>1</priority></rule>
-<rule ref="rulesets/basic.xml/UnconditionalIfStatement"><priority>1</priority></rule>
-<rule ref="rulesets/basic.xml/EmptyStatementNotInLoop"><priority>1</priority></rule>
-<rule ref="rulesets/basic.xml/BooleanInstantiation"><priority>1</priority></rule>
-<rule ref="rulesets/basic.xml/UnnecessaryFinalModifier"><priority>1</priority></rule>
-<rule ref="rulesets/basic.xml/CollapsibleIfStatements"><priority>1</priority></rule>
-<rule ref="rulesets/basic.xml/UselessOverridingMethod"><priority>1</priority></rule>
-<rule ref="rulesets/basic.xml/ClassCastExceptionWithToArray"><priority>1</priority></rule>
-<rule ref="rulesets/basic.xml/AvoidDecimalLiteralsInBigDecimalConstructor"><priority>1</priority></rule>
-<rule ref="rulesets/basic.xml/UselessOperationOnImmutable"><priority>1</priority></rule>
-<rule ref="rulesets/basic.xml/MisplacedNullCheck"><priority>1</priority></rule>
-<rule ref="rulesets/basic.xml/UnusedNullCheckInEquals"><priority>1</priority></rule>
-<rule ref="rulesets/basic.xml/BrokenNullCheck"><priority>1</priority></rule>
-<rule ref="rulesets/basic.xml/BigIntegerInstantiation"><priority>1</priority></rule>
-<rule ref="rulesets/basic.xml/AvoidMultipleUnaryOperators"><priority>1</priority></rule>
-<rule ref="rulesets/basic.xml/EmptyInitializer"><priority>1</priority></rule>
+<rule ref="rulesets/java/empty.xml/EmptyIfStmt"><priority>1</priority></rule>
+<rule ref="rulesets/java/empty.xml/EmptyWhileStmt"><priority>1</priority></rule>
+<rule ref="rulesets/java/empty.xml/EmptyTryBlock"><priority>1</priority></rule>
+<rule ref="rulesets/java/empty.xml/EmptyFinallyBlock"><priority>1</priority></rule>
+<rule ref="rulesets/java/empty.xml/EmptySwitchStatements"><priority>1</priority></rule>
+<rule ref="rulesets/java/basic.xml/JumbledIncrementer"><priority>1</priority></rule>
+<rule ref="rulesets/java/basic.xml/ForLoopShouldBeWhileLoop"><priority>1</priority></rule>
+<rule ref="rulesets/java/unnecessary.xml/UnnecessaryConversionTemporary"><priority>1</priority></rule>
+<rule ref="rulesets/java/basic.xml/OverrideBothEqualsAndHashcode"><priority>1</priority></rule>
+<rule ref="rulesets/java/basic.xml/DoubleCheckedLocking"><priority>1</priority></rule>
+<rule ref="rulesets/java/basic.xml/ReturnFromFinallyBlock"><priority>1</priority></rule>
+<rule ref="rulesets/java/empty.xml/EmptySynchronizedBlock"><priority>1</priority></rule>
+<rule ref="rulesets/java/empty.xml/EmptyStaticInitializer"><priority>1</priority></rule>
+<rule ref="rulesets/java/basic.xml/UnconditionalIfStatement"><priority>1</priority></rule>
+<rule ref="rulesets/java/empty.xml/EmptyStatementNotInLoop"><priority>1</priority></rule>
+<rule ref="rulesets/java/basic.xml/BooleanInstantiation"><priority>1</priority></rule>
+<rule ref="rulesets/java/unnecessary.xml/UnnecessaryFinalModifier"><priority>1</priority></rule>
+<rule ref="rulesets/java/basic.xml/CollapsibleIfStatements"><priority>1</priority></rule>
+<rule ref="rulesets/java/unnecessary.xml/UselessOverridingMethod"><priority>1</priority></rule>
+<rule ref="rulesets/java/basic.xml/ClassCastExceptionWithToArray"><priority>1</priority></rule>
+<rule ref="rulesets/java/basic.xml/AvoidDecimalLiteralsInBigDecimalConstructor"><priority>1</priority></rule>
+<rule ref="rulesets/java/unnecessary.xml/UselessOperationOnImmutable"><priority>1</priority></rule>
+<rule ref="rulesets/java/basic.xml/MisplacedNullCheck"><priority>1</priority></rule>
+<rule ref="rulesets/java/unnecessary.xml/UnusedNullCheckInEquals"><priority>1</priority></rule>
+<rule ref="rulesets/java/basic.xml/BrokenNullCheck"><priority>1</priority></rule>
+<rule ref="rulesets/java/basic.xml/BigIntegerInstantiation"><priority>1</priority></rule>
+<rule ref="rulesets/java/basic.xml/AvoidMultipleUnaryOperators"><priority>1</priority></rule>
+<rule ref="rulesets/java/empty.xml/EmptyInitializer"><priority>1</priority></rule>
 
-<rule ref="rulesets/braces.xml/IfStmtsMustUseBraces"><priority>1</priority></rule>
-<rule ref="rulesets/braces.xml/WhileLoopsMustUseBraces"><priority>1</priority></rule>
-<rule ref="rulesets/braces.xml/IfElseStmtsMustUseBraces"><priority>1</priority></rule>
-<rule ref="rulesets/braces.xml/ForLoopsMustUseBraces"><priority>1</priority></rule>
+<rule ref="rulesets/java/braces.xml/IfStmtsMustUseBraces"><priority>1</priority></rule>
+<rule ref="rulesets/java/braces.xml/WhileLoopsMustUseBraces"><priority>1</priority></rule>
+<rule ref="rulesets/java/braces.xml/IfElseStmtsMustUseBraces"><priority>1</priority></rule>
+<rule ref="rulesets/java/braces.xml/ForLoopsMustUseBraces"><priority>1</priority></rule>
 
-<rule ref="rulesets/controversial.xml/UnusedModifier"><priority>1</priority></rule>
-<rule ref="rulesets/controversial.xml/DontImportSun"><priority>1</priority></rule>
-<rule ref="rulesets/controversial.xml/UnnecessaryParentheses"><priority>1</priority></rule>
+<rule ref="rulesets/java/unusedcode.xml/UnusedModifier"><priority>1</priority></rule>
+<rule ref="rulesets/java/controversial.xml/DontImportSun"><priority>1</priority></rule>
 
-<rule ref="rulesets/design.xml/SimplifyBooleanReturns"><priority>1</priority></rule>
-<rule ref="rulesets/design.xml/SimplifyBooleanExpressions"><priority>1</priority></rule>
-<rule ref="rulesets/design.xml/AvoidReassigningParameters"><priority>1</priority></rule>
-<rule ref="rulesets/design.xml/FinalFieldCouldBeStatic"><priority>1</priority></rule>
-<rule ref="rulesets/design.xml/NonStaticInitializer"><priority>1</priority></rule>
-<rule ref="rulesets/design.xml/OptimizableToArrayCall"><priority>1</priority></rule>
-<rule ref="rulesets/design.xml/BadComparison"><priority>1</priority></rule>
-<rule ref="rulesets/design.xml/EqualsNull"><priority>1</priority></rule>
-<rule ref="rulesets/design.xml/InstantiationToGetClass"><priority>1</priority></rule>
-<rule ref="rulesets/design.xml/IdempotentOperations"><priority>1</priority></rule>
-<rule ref="rulesets/design.xml/AssignmentToNonFinalStatic"><priority>1</priority></rule>
-<rule ref="rulesets/design.xml/MissingStaticMethodInNonInstantiatableClass"><priority>1</priority></rule>
-<rule ref="rulesets/design.xml/UseNotifyAllInsteadOfNotify"><priority>1</priority></rule>
-<rule ref="rulesets/design.xml/AvoidInstanceofChecksInCatchClause"><priority>1</priority></rule>
-<rule ref="rulesets/design.xml/SimplifyConditional"><priority>1</priority></rule>
-<rule ref="rulesets/design.xml/UnnecessaryLocalBeforeReturn"><priority>1</priority></rule>
-<rule ref="rulesets/design.xml/NonThreadSafeSingleton"><priority>1</priority></rule>
-<rule ref="rulesets/design.xml/AvoidConstantsInterface"><priority>1</priority></rule>
-<rule ref="rulesets/design.xml/UnsynchronizedStaticDateFormatter"><priority>1</priority></rule>
-<rule ref="rulesets/design.xml/PreserveStackTrace"><priority>1</priority></rule>
-<rule ref="rulesets/design.xml/UseCollectionIsEmpty"><priority>1</priority></rule>
+<rule ref="rulesets/java/design.xml/SimplifyBooleanReturns"><priority>1</priority></rule>
+<rule ref="rulesets/java/design.xml/SimplifyBooleanExpressions"><priority>1</priority></rule>
+<rule ref="rulesets/java/design.xml/AvoidReassigningParameters"><priority>1</priority></rule>
+<rule ref="rulesets/java/design.xml/FinalFieldCouldBeStatic"><priority>1</priority></rule>
+<rule ref="rulesets/java/design.xml/NonStaticInitializer"><priority>1</priority></rule>
+<rule ref="rulesets/java/design.xml/OptimizableToArrayCall"><priority>1</priority></rule>
+<rule ref="rulesets/java/design.xml/BadComparison"><priority>1</priority></rule>
+<rule ref="rulesets/java/design.xml/EqualsNull"><priority>1</priority></rule>
+<rule ref="rulesets/java/design.xml/InstantiationToGetClass"><priority>1</priority></rule>
+<rule ref="rulesets/java/design.xml/IdempotentOperations"><priority>1</priority></rule>
+<rule ref="rulesets/java/design.xml/AssignmentToNonFinalStatic"><priority>1</priority></rule>
+<rule ref="rulesets/java/design.xml/MissingStaticMethodInNonInstantiatableClass"><priority>1</priority></rule>
+<rule ref="rulesets/java/design.xml/UseNotifyAllInsteadOfNotify"><priority>1</priority></rule>
+<rule ref="rulesets/java/design.xml/AvoidInstanceofChecksInCatchClause"><priority>1</priority></rule>
+<rule ref="rulesets/java/design.xml/SimplifyConditional"><priority>1</priority></rule>
+<rule ref="rulesets/java/design.xml/UnnecessaryLocalBeforeReturn"><priority>1</priority></rule>
+<rule ref="rulesets/java/design.xml/NonThreadSafeSingleton"><priority>1</priority></rule>
+<rule ref="rulesets/java/design.xml/AvoidConstantsInterface"><priority>1</priority></rule>
+<rule ref="rulesets/java/design.xml/UnsynchronizedStaticDateFormatter"><priority>1</priority></rule>
+<rule ref="rulesets/java/design.xml/PreserveStackTrace"><priority>1</priority></rule>
+<rule ref="rulesets/java/design.xml/UseCollectionIsEmpty"><priority>1</priority></rule>
 
-<rule ref="rulesets/finalizers.xml/EmptyFinalizer"><priority>1</priority></rule>
-<rule ref="rulesets/finalizers.xml/FinalizeOnlyCallsSuperFinalize"><priority>1</priority></rule>
-<rule ref="rulesets/finalizers.xml/FinalizeOverloaded"><priority>1</priority></rule>
-<rule ref="rulesets/finalizers.xml/FinalizeDoesNotCallSuperFinalize"><priority>1</priority></rule>
-<rule ref="rulesets/finalizers.xml/FinalizeShouldBeProtected"><priority>1</priority></rule>
-<rule ref="rulesets/finalizers.xml/AvoidCallingFinalize"><priority>1</priority></rule>
+<rule ref="rulesets/java/finalizers.xml/EmptyFinalizer"><priority>1</priority></rule>
+<rule ref="rulesets/java/finalizers.xml/FinalizeOnlyCallsSuperFinalize"><priority>1</priority></rule>
+<rule ref="rulesets/java/finalizers.xml/FinalizeOverloaded"><priority>1</priority></rule>
+<rule ref="rulesets/java/finalizers.xml/FinalizeDoesNotCallSuperFinalize"><priority>1</priority></rule>
+<rule ref="rulesets/java/finalizers.xml/FinalizeShouldBeProtected"><priority>1</priority></rule>
+<rule ref="rulesets/java/finalizers.xml/AvoidCallingFinalize"><priority>1</priority></rule>
 
-<rule ref="rulesets/imports.xml/DuplicateImports"><priority>1</priority></rule>
-<rule ref="rulesets/imports.xml/DontImportJavaLang"><priority>1</priority></rule>
-<rule ref="rulesets/imports.xml/UnusedImports"><priority>1</priority></rule>
-<rule ref="rulesets/imports.xml/ImportFromSamePackage"><priority>1</priority></rule>
+<rule ref="rulesets/java/imports.xml/DuplicateImports"><priority>1</priority></rule>
+<rule ref="rulesets/java/imports.xml/DontImportJavaLang"><priority>1</priority></rule>
+<rule ref="rulesets/java/imports.xml/UnusedImports"><priority>1</priority></rule>
+<rule ref="rulesets/java/imports.xml/ImportFromSamePackage"><priority>1</priority></rule>
 
-<rule ref="rulesets/logging-java.xml/MoreThanOneLogger"><priority>1</priority></rule>
-<rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"><priority>1</priority></rule>
+<rule ref="rulesets/java/logging-java.xml/MoreThanOneLogger"><priority>1</priority></rule>
+<rule ref="rulesets/java/logging-java.xml/LoggerIsNotStaticFinal"><priority>1</priority></rule>
 
-<rule ref="rulesets/migrating.xml/ReplaceVectorWithList"><priority>1</priority></rule>
-<rule ref="rulesets/migrating.xml/ReplaceHashtableWithMap"><priority>1</priority></rule>
-<rule ref="rulesets/migrating.xml/ReplaceEnumerationWithIterator"><priority>1</priority></rule>
-<rule ref="rulesets/migrating.xml/AvoidEnumAsIdentifier"><priority>1</priority></rule>
-<rule ref="rulesets/migrating.xml/AvoidAssertAsIdentifier"><priority>1</priority></rule>
-<rule ref="rulesets/migrating.xml/IntegerInstantiation"><priority>1</priority></rule>
-<rule ref="rulesets/migrating.xml/ByteInstantiation"><priority>1</priority></rule>
-<rule ref="rulesets/migrating.xml/ShortInstantiation"><priority>1</priority></rule>
-<rule ref="rulesets/migrating.xml/LongInstantiation"><priority>1</priority></rule>
+<rule ref="rulesets/java/migrating.xml/ReplaceVectorWithList"><priority>1</priority></rule>
+<rule ref="rulesets/java/migrating.xml/ReplaceHashtableWithMap"><priority>1</priority></rule>
+<rule ref="rulesets/java/migrating.xml/ReplaceEnumerationWithIterator"><priority>1</priority></rule>
+<rule ref="rulesets/java/migrating.xml/AvoidEnumAsIdentifier"><priority>1</priority></rule>
+<rule ref="rulesets/java/migrating.xml/AvoidAssertAsIdentifier"><priority>1</priority></rule>
+<rule ref="rulesets/java/migrating.xml/IntegerInstantiation"><priority>1</priority></rule>
+<rule ref="rulesets/java/migrating.xml/ByteInstantiation"><priority>1</priority></rule>
+<rule ref="rulesets/java/migrating.xml/ShortInstantiation"><priority>1</priority></rule>
+<rule ref="rulesets/java/migrating.xml/LongInstantiation"><priority>1</priority></rule>
 
-<rule ref="rulesets/naming.xml/VariableNamingConventions"><priority>1</priority></rule>
-<rule ref="rulesets/naming.xml/MethodNamingConventions"><priority>1</priority></rule>
-<rule ref="rulesets/naming.xml/ClassNamingConventions"><priority>1</priority></rule>
-<rule ref="rulesets/naming.xml/AvoidDollarSigns"><priority>1</priority></rule>
-<rule ref="rulesets/naming.xml/MethodWithSameNameAsEnclosingClass"><priority>1</priority></rule>
-<rule ref="rulesets/naming.xml/SuspiciousHashcodeMethodName"><priority>1</priority></rule>
-<rule ref="rulesets/naming.xml/SuspiciousConstantFieldName"><priority>1</priority></rule>
-<rule ref="rulesets/naming.xml/SuspiciousEqualsMethodName"><priority>1</priority></rule>
-<rule ref="rulesets/naming.xml/NoPackage"><priority>1</priority></rule>
-<rule ref="rulesets/naming.xml/PackageCase"><priority>1</priority></rule>
+<rule ref="rulesets/java/naming.xml/VariableNamingConventions"><priority>1</priority></rule>
+<rule ref="rulesets/java/naming.xml/MethodNamingConventions"><priority>1</priority></rule>
+<rule ref="rulesets/java/naming.xml/ClassNamingConventions"><priority>1</priority></rule>
+<rule ref="rulesets/java/naming.xml/AvoidDollarSigns"><priority>1</priority></rule>
+<rule ref="rulesets/java/naming.xml/MethodWithSameNameAsEnclosingClass"><priority>1</priority></rule>
+<rule ref="rulesets/java/naming.xml/SuspiciousHashcodeMethodName"><priority>1</priority></rule>
+<rule ref="rulesets/java/naming.xml/SuspiciousConstantFieldName"><priority>1</priority></rule>
+<rule ref="rulesets/java/naming.xml/SuspiciousEqualsMethodName"><priority>1</priority></rule>
+<rule ref="rulesets/java/naming.xml/NoPackage"><priority>1</priority></rule>
+<rule ref="rulesets/java/naming.xml/PackageCase"><priority>1</priority></rule>
 
-<rule ref="rulesets/optimizations.xml/LocalVariableCouldBeFinal"><priority>1</priority></rule>
-<rule ref="rulesets/optimizations.xml/MethodArgumentCouldBeFinal"><priority>1</priority></rule>
-<rule ref="rulesets/optimizations.xml/UseArrayListInsteadOfVector"><priority>1</priority></rule>
-<rule ref="rulesets/optimizations.xml/SimplifyStartsWith"><priority>1</priority></rule>
-<rule ref="rulesets/optimizations.xml/UseArraysAsList"><priority>1</priority></rule>
-<rule ref="rulesets/optimizations.xml/AvoidArrayLoops"><priority>1</priority></rule>
-<rule ref="rulesets/optimizations.xml/UnnecessaryWrapperObjectCreation"><priority>1</priority></rule>
-<rule ref="rulesets/optimizations.xml/AddEmptyString"><priority>1</priority></rule>
+<rule ref="rulesets/java/optimizations.xml/LocalVariableCouldBeFinal"><priority>1</priority><properties><property name="violationSuppressXPath" value="//ForInit|//ForStatement/LocalVariableDeclaration"/></properties></rule>
+<rule ref="rulesets/java/optimizations.xml/MethodArgumentCouldBeFinal"><priority>1</priority></rule>
+<rule ref="rulesets/java/optimizations.xml/UseArrayListInsteadOfVector"><priority>1</priority></rule>
+<rule ref="rulesets/java/optimizations.xml/SimplifyStartsWith"><priority>1</priority></rule>
+<rule ref="rulesets/java/optimizations.xml/UseArraysAsList"><priority>1</priority></rule>
+<rule ref="rulesets/java/optimizations.xml/AvoidArrayLoops"><priority>1</priority></rule>
+<rule ref="rulesets/java/optimizations.xml/UnnecessaryWrapperObjectCreation"><priority>1</priority></rule>
+<rule ref="rulesets/java/optimizations.xml/AddEmptyString"><priority>1</priority></rule>
 
-<rule ref="rulesets/strictexception.xml/AvoidCatchingThrowable"><priority>1</priority></rule>
-<rule ref="rulesets/strictexception.xml/SignatureDeclareThrowsException"><priority>1</priority></rule>
-<rule ref="rulesets/strictexception.xml/ExceptionAsFlowControl"><priority>1</priority></rule>
-<rule ref="rulesets/strictexception.xml/AvoidCatchingNPE"><priority>1</priority></rule>
-<rule ref="rulesets/strictexception.xml/AvoidThrowingRawExceptionTypes"><priority>1</priority></rule>
-<rule ref="rulesets/strictexception.xml/DoNotExtendJavaLangError"><priority>1</priority></rule>
-<rule ref="rulesets/strictexception.xml/DoNotThrowExceptionInFinally"><priority>1</priority></rule>
-<rule ref="rulesets/strictexception.xml/AvoidThrowingNewInstanceOfSameException"><priority>1</priority></rule>
+<rule ref="rulesets/java/strictexception.xml/AvoidCatchingThrowable"><priority>1</priority></rule>
+<rule ref="rulesets/java/strictexception.xml/SignatureDeclareThrowsException"><priority>1</priority></rule>
+<rule ref="rulesets/java/strictexception.xml/ExceptionAsFlowControl"><priority>1</priority></rule>
+<rule ref="rulesets/java/strictexception.xml/AvoidCatchingNPE"><priority>1</priority></rule>
+<rule ref="rulesets/java/strictexception.xml/AvoidThrowingRawExceptionTypes"><priority>1</priority></rule>
+<rule ref="rulesets/java/strictexception.xml/DoNotExtendJavaLangError"><priority>1</priority></rule>
+<rule ref="rulesets/java/strictexception.xml/DoNotThrowExceptionInFinally"><priority>1</priority></rule>
+<rule ref="rulesets/java/strictexception.xml/AvoidThrowingNewInstanceOfSameException"><priority>1</priority></rule>
 
-<rule ref="rulesets/strings.xml/StringInstantiation"><priority>1</priority></rule>
-<rule ref="rulesets/strings.xml/StringToString"><priority>1</priority></rule>
-<rule ref="rulesets/strings.xml/InefficientStringBuffering"><priority>1</priority></rule>
-<rule ref="rulesets/strings.xml/UnnecessaryCaseChange"><priority>1</priority></rule>
-<rule ref="rulesets/strings.xml/UseStringBufferLength"><priority>1</priority></rule>
-<rule ref="rulesets/strings.xml/AppendCharacterWithChar"><priority>1</priority></rule>
-<rule ref="rulesets/strings.xml/UseIndexOfChar"><priority>1</priority></rule>
-<rule ref="rulesets/strings.xml/InefficientEmptyStringCheck"><priority>1</priority></rule>
-<rule ref="rulesets/strings.xml/UselessStringValueOf"><priority>1</priority></rule>
-<rule ref="rulesets/strings.xml/StringBufferInstantiationWithChar"><priority>1</priority></rule>
-<rule ref="rulesets/strings.xml/UseEqualsToCompareStrings"><priority>1</priority></rule>
+<rule ref="rulesets/java/strings.xml/StringInstantiation"><priority>1</priority></rule>
+<rule ref="rulesets/java/strings.xml/StringToString"><priority>1</priority></rule>
+<rule ref="rulesets/java/strings.xml/InefficientStringBuffering"><priority>1</priority></rule>
+<rule ref="rulesets/java/strings.xml/UnnecessaryCaseChange"><priority>1</priority></rule>
+<rule ref="rulesets/java/strings.xml/UseStringBufferLength"><priority>1</priority></rule>
+<rule ref="rulesets/java/strings.xml/AppendCharacterWithChar"><priority>1</priority></rule>
+<rule ref="rulesets/java/strings.xml/UseIndexOfChar"><priority>1</priority></rule>
+<rule ref="rulesets/java/strings.xml/InefficientEmptyStringCheck"><priority>1</priority></rule>
+<rule ref="rulesets/java/strings.xml/UselessStringValueOf"><priority>1</priority></rule>
+<rule ref="rulesets/java/strings.xml/StringBufferInstantiationWithChar"><priority>1</priority></rule>
+<rule ref="rulesets/java/strings.xml/UseEqualsToCompareStrings"><priority>1</priority></rule>
 
-<rule ref="rulesets/typeresolution.xml/UnusedImports"><priority>1</priority></rule>
-<rule ref="rulesets/typeresolution.xml/SignatureDeclareThrowsException"><priority>1</priority></rule>
+<rule ref="rulesets/java/typeresolution.xml/UnusedImports"><priority>1</priority><properties><property name="violationSuppressXPath" value="//ImportDeclaration[@ImportOnDemand='true']"/></properties></rule>
+<rule ref="rulesets/java/typeresolution.xml/SignatureDeclareThrowsException"><priority>1</priority></rule>
 
-<rule ref="rulesets/unusedcode.xml/UnusedPrivateField"><priority>1</priority></rule>
-<rule ref="rulesets/unusedcode.xml/UnusedLocalVariable"><priority>1</priority></rule>
-<rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod"><priority>1</priority></rule>
-<rule ref="rulesets/unusedcode.xml/UnusedFormalParameter"><priority>1</priority></rule>
+<rule ref="rulesets/java/unusedcode.xml/UnusedPrivateField"><priority>1</priority></rule>
+<rule ref="rulesets/java/unusedcode.xml/UnusedLocalVariable"><priority>1</priority></rule>
+<rule ref="rulesets/java/unusedcode.xml/UnusedPrivateMethod"><priority>1</priority></rule>
+<rule ref="rulesets/java/unusedcode.xml/UnusedFormalParameter"><priority>1</priority></rule>
 
 </ruleset>

src/com/dmdirc/Server.java

@@ -109,7 +109,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 public class Server extends FrameContainer implements ConfigChangeListener,
         CertificateProblemListener, Connection {
 
-    private static final org.slf4j.Logger log = LoggerFactory.getLogger(Server.class);
+    private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(Server.class);
     /** The name of the general domain. */
     private static final String DOMAIN_GENERAL = "general";
     /** The name of the profile domain. */
@@ -311,12 +311,11 @@ public class Server extends FrameContainer implements ConfigChangeListener,
         assert profile != null;
 
         synchronized (myStateLock) {
-            log.info("Connecting to {}, current state is {}", address,
-                    myState.getState());
+            LOG.info("Connecting to {}, current state is {}", address, myState.getState());
 
             switch (myState.getState()) {
                 case RECONNECT_WAIT:
-                    log.debug("Cancelling reconnection timer");
+                    LOG.debug("Cancelling reconnection timer");
                     if (reconnectTimerFuture != null) {
                         reconnectTimerFuture.cancel(false);
                     }
@@ -414,7 +413,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
     @Override
     public void disconnect(final String reason) {
         synchronized (myStateLock) {
-            log.info("Disconnecting. Current state: {}", myState.getState());
+            LOG.info("Disconnecting. Current state: {}", myState.getState());
 
             switch (myState.getState()) {
                 case CLOSING:
@@ -423,7 +422,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
                 case TRANSIENTLY_DISCONNECTED:
                     return;
                 case RECONNECT_WAIT:
-                    log.debug("Cancelling reconnection timer");
+                    LOG.debug("Cancelling reconnection timer");
                     if (reconnectTimerFuture != null) {
                         reconnectTimerFuture.cancel(false);
                     }
@@ -467,7 +466,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
     @Precondition("The server state is transiently disconnected")
     private void doDelayedReconnect() {
         synchronized (myStateLock) {
-            log.info("Performing delayed reconnect. State: {}", myState.getState());
+            LOG.info("Performing delayed reconnect. State: {}", myState.getState());
 
             if (myState.getState() != ServerState.TRANSIENTLY_DISCONNECTED) {
                 throw new IllegalStateException("doDelayedReconnect when not "
@@ -483,8 +482,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
                 @Override
                 public void run() {
                     synchronized (myStateLock) {
-                        log.debug("Reconnect task executing, state: {}",
-                                myState.getState());
+                        LOG.debug("Reconnect task executing, state: {}", myState.getState());
                         if (myState.getState() == ServerState.RECONNECT_WAIT) {
                             myState.transition(ServerState.TRANSIENTLY_DISCONNECTED);
                             reconnect();
@@ -493,7 +491,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
                 }
             }, delay, TimeUnit.MILLISECONDS);
 
-            log.info("Scheduling reconnect task for delay of {}", delay);
+            LOG.info("Scheduling reconnect task for delay of {}", delay);
 
             myState.transition(ServerState.RECONNECT_WAIT);
             updateIcon();
@@ -1188,14 +1186,14 @@ public class Server extends FrameContainer implements ConfigChangeListener,
      * Called when the socket has been closed.
      */
     public void onSocketClosed() {
-        log.info("Received socket closed event, state: {}", myState.getState());
+        LOG.info("Received socket closed event, state: {}", myState.getState());
 
         if (whoTimerFuture != null) {
             whoTimerFuture.cancel(false);
         }
 
         if (Thread.holdsLock(myStateLock)) {
-            log.info("State lock contended: rerunning on a new thread");
+            LOG.info("State lock contended: rerunning on a new thread");
 
             executorService.schedule(new Runnable() {
                 @Override
@@ -1264,8 +1262,8 @@ public class Server extends FrameContainer implements ConfigChangeListener,
     @Precondition("The current server state is CONNECTING")
     public void onConnectError(final ParserError errorInfo) {
         synchronized (myStateLock) {
-            log.info("Received connect error event, state: {}; error: {}",
-                    myState.getState(), errorInfo);
+            LOG.info("Received connect error event, state: {}; error: {}", myState.getState(),
+                    errorInfo);
 
             if (myState.getState() == ServerState.CLOSING
                     || myState.getState() == ServerState.DISCONNECTING) {
@@ -1337,7 +1335,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
 
         if (parser.getPingTime()
                 >= getConfigManager().getOptionInt(DOMAIN_SERVER, "pingtimeout")) {
-            log.warn("Server appears to be stoned, reconnecting");
+            LOG.warn("Server appears to be stoned, reconnecting");
             handleNotification("stonedServer", getAddress());
             reconnect();
         }

src/com/dmdirc/commandparser/PopupMenuItem.java

@@ -150,7 +150,7 @@ public class PopupMenuItem {
 
             if (offset >= expectedArgs) {
                 if (builder.length() > 0) {
-                    builder.append("\n");
+                    builder.append('\n');
                 }
 
                 builder.append(commandManager.getCommandChar());
@@ -165,7 +165,7 @@ public class PopupMenuItem {
             }
 
             if (builder.length() > 0) {
-                builder.append("\n");
+                builder.append('\n');
             }
 
             builder.append(commandManager.getCommandChar());

src/com/dmdirc/config/ConfigFileBackedConfigProvider.java

@@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory;
  */
 public class ConfigFileBackedConfigProvider extends BaseConfigProvider implements ConfigProvider {
 
-    private static final org.slf4j.Logger log = LoggerFactory.getLogger(
+    private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(
             ConfigFileBackedConfigProvider.class);
     /** The domain used for identity settings. */
     private static final String DOMAIN = "identity";
@@ -318,7 +318,7 @@ public class ConfigFileBackedConfigProvider extends BaseConfigProvider implement
 
         synchronized (this) {
             oldValue = getOption(domain, option);
-            log.trace("{}: setting {}.{} to {} (was: {})", getName(), domain, option, value,
+            LOG.trace("{}: setting {}.{} to {} (was: {})", getName(), domain, option, value,
                     oldValue);
 
             if (myTarget.getType() == ConfigTarget.TYPE.GLOBAL) {
@@ -409,11 +409,11 @@ public class ConfigFileBackedConfigProvider extends BaseConfigProvider implement
 
     @Override
     public synchronized void save() {
-        log.info("{}: saving. Needsave = {}", new Object[]{getName(), needSave});
+        LOG.info("{}: saving. Needsave = {}", new Object[]{getName(), needSave});
 
         if (needSave && file != null && file.isWritable()) {
             if (myTarget != null && myTarget.getType() == ConfigTarget.TYPE.GLOBAL) {
-                log.debug("{}: I'm a global config", getName());
+                LOG.debug("{}: I'm a global config", getName());
 
                 // This branch is executed if this identity is global. In this
                 // case, we build a global config (removing ourself and the
@@ -437,9 +437,9 @@ public class ConfigFileBackedConfigProvider extends BaseConfigProvider implement
                 globalConfig.removeIdentity(this);
                 globalConfig.removeIdentity(identityManager.getVersionSettings());
 
-                if (log.isTraceEnabled()) {
+                if (LOG.isTraceEnabled()) {
                     for (ConfigProvider source : globalConfig.getSources()) {
-                        log.trace("{}: source: {}",
+                        LOG.trace("{}: source: {}",
                                 new Object[]{getName(), source.getName()});
                     }
                 }
@@ -455,7 +455,7 @@ public class ConfigFileBackedConfigProvider extends BaseConfigProvider implement
 
                         if (globalConfig.hasOptionString(domain, key)
                                 && globalConfig.getOption(domain, key).equals(value)) {
-                            log.debug("{}: found superfluous setting: {}.{} (= {})", getName(),
+                            LOG.debug("{}: found superfluous setting: {}.{} (= {})", getName(),
                                     domain, key, value);
                             file.getKeyDomain(domain).remove(key);
                         }

src/com/dmdirc/config/ConfigManager.java

@@ -39,6 +39,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
@@ -47,7 +48,7 @@ import org.slf4j.LoggerFactory;
 class ConfigManager extends BaseConfigProvider implements ConfigChangeListener,
         ConfigProviderListener, AggregateConfigProvider {
 
-    private static final org.slf4j.Logger log = LoggerFactory.getLogger(ConfigManager.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ConfigManager.class);
     /** Temporary map for lookup stats. */
     private static final Map<String, Integer> STATS = new TreeMap<>();
     /** Magical domain to redirect to the version identity. */
@@ -276,7 +277,7 @@ class ConfigManager extends BaseConfigProvider implements ConfigChangeListener,
         final boolean result = comp != null
                 && identityTargetMatches(identity.getTarget().getData(), comp);
 
-        log.trace("Checking if identity {} applies. Comparison: {}, target: {}, result: {}",
+        LOG.trace("Checking if identity {} applies. Comparison: {}, target: {}, result: {}",
                 identity, comp, identity.getTarget().getData(), result);
 
         return result;
@@ -359,8 +360,9 @@ class ConfigManager extends BaseConfigProvider implements ConfigChangeListener,
      */
     void migrate(final String protocol, final String ircd,
             final String network, final String server, final String channel) {
-        log.debug("Migrating from {{}, {}, {}, {}, {}} to {{}, {}, {}, {}, {}}", this.protocol, this.ircd,
-                this.network, this.server, this.channel, protocol, ircd, network, server, channel);
+        LOG.debug("Migrating from {{}, {}, {}, {}, {}} to {{}, {}, {}, {}, {}}", this.protocol,
+                this.ircd, this.network, this.server, this.channel, protocol, ircd, network, server,
+                channel);
 
         this.protocol = protocol;
         this.ircd = ircd;
@@ -370,18 +372,18 @@ class ConfigManager extends BaseConfigProvider implements ConfigChangeListener,
 
         for (ConfigProvider identity : new ArrayList<>(sources)) {
             if (!identityApplies(identity)) {
-                log.debug("Removing identity that no longer applies: {}", identity);
+                LOG.debug("Removing identity that no longer applies: {}", identity);
                 removeIdentity(identity);
             }
         }
 
         final List<ConfigProvider> newSources = manager.getIdentitiesForManager(this);
         for (ConfigProvider identity : newSources) {
-            log.trace("Testing new identity: {}", identity);
+            LOG.trace("Testing new identity: {}", identity);
             checkIdentity(identity);
         }
 
-        log.debug("New identities: {}", sources);
+        LOG.debug("New identities: {}", sources);
     }
 
     /**

src/com/dmdirc/config/IdentityManager.java

@@ -49,6 +49,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import static com.google.common.base.Preconditions.checkArgument;
@@ -56,7 +57,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 public class IdentityManager implements IdentityFactory, IdentityController {
 
-    private static final org.slf4j.Logger log = LoggerFactory.getLogger(IdentityManager.class);
+    private static final Logger LOG = LoggerFactory.getLogger(IdentityManager.class);
     /** A regular expression that will match all characters illegal in file names. */
     private static final String ILLEGAL_CHARS = "[\\\\\"/:\\*\\?\"<>\\|]";
     /** The domain used for identity settings. */
@@ -77,7 +78,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
     /** The event bus to post events to. */
     private final DMDircMBassador eventBus;
     /**
-     * The {@link IdentityListener}s that have registered with this manager.
+     * The {@link ConfigProviderListener}s that have registered with this manager.
      *
      * Listeners for standard identities are inserted with a <code>null</code> key, listeners for a
      * specific custom type use their type as the key.
@@ -417,8 +418,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
             identities.add(target, identity);
         }
 
-        log.debug("Adding identity: {} (group: {})",
-                new Object[]{identity, target});
+        LOG.debug("Adding identity: {} (group: {})", new Object[]{identity, target});
 
         synchronized (listeners) {
             for (ConfigProviderListener listener : listeners.safeGet(target)) {
@@ -491,7 +491,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
 
         Collections.sort(sources, new ConfigProviderTargetComparator());
 
-        log.debug("Found {} source(s) for {}", sources.size(), manager);
+        LOG.debug("Found {} source(s) for {}", sources.size(), manager);
 
         return sources;
     }
@@ -693,7 +693,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
         final List<ConfigProvider> sources = getIdentitiesForManager(configManager);
 
         for (ConfigProvider identity : sources) {
-            log.trace("Found {}", identity);
+            LOG.trace("Found {}", identity);
             configManager.checkIdentity(identity);
         }
 

src/com/dmdirc/config/prefs/PreferencesCategory.java

@@ -27,6 +27,7 @@ import com.dmdirc.util.collections.ListenerList;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
@@ -35,7 +36,7 @@ import org.slf4j.LoggerFactory;
  */
 public class PreferencesCategory {
 
-    private static final org.slf4j.Logger log = LoggerFactory.getLogger(PreferencesCategory.class);
+    private static final Logger LOG = LoggerFactory.getLogger(PreferencesCategory.class);
     /** The title (name) of this category. */
     private final String title;
     /** A description of this category. */
@@ -235,11 +236,11 @@ public class PreferencesCategory {
      * @return Is a restart needed after saving?
      */
     public boolean save() {
-        log.debug("{} save method called", getTitle());
+        LOG.debug("{} save method called", getTitle());
 
         boolean restart = false;
         for (PreferencesSetting setting : settings) {
-            log.trace("{}: saving setting '{}'", getTitle(), setting.getTitle());
+            LOG.trace("{}: saving setting '{}'", getTitle(), setting.getTitle());
             if (setting.save() && setting.isRestartNeeded()) {
                 restart = true;
             }

src/com/dmdirc/config/prefs/reader/CategoryReader.java

@@ -61,15 +61,15 @@ public class CategoryReader {
     private static final String PARENT_KEY = "parent";
     private static final String ICON_KEY = "icon";
     private static final String DOMAIN_KEY = "domain";
-    private static final String ITEMS_KEY = "items";
+    private static final String ITEMS_KEY = "items"; // NOPMD
 
     private final Map<Object, Object> data;
     private final List<PreferencesSetting> items = new LinkedList<>();
     private String title;
     private String description;
     private String icon;
-    private String parent;
-    private String domain;
+    private String parent;  // NOPMD
+    private String domain;  // NOPMD
 
     public CategoryReader(final Map<Object, Object> data) {
         this.data = checkNotNull(data);

src/com/dmdirc/events/DisplayProperty.java

@@ -30,8 +30,8 @@ import com.dmdirc.util.colours.Colour;
 public final class DisplayProperty<T> {
 
     /** The foreground colour of text relating to the event. */
-    public static DisplayProperty<Colour> FOREGROUND_COLOUR = new DisplayProperty<>();
+    public static final DisplayProperty<Colour> FOREGROUND_COLOUR = new DisplayProperty<>();
     /** The background colour of text relating to the event. */
-    public static DisplayProperty<Colour> BACKGROUND_COLOUR = new DisplayProperty<>();
+    public static final DisplayProperty<Colour> BACKGROUND_COLOUR = new DisplayProperty<>();
 
 }

src/com/dmdirc/logger/ErrorReporter.java

@@ -129,7 +129,7 @@ public class ErrorReporter {
             title.append(" user: ").append(userModes);
         }
 
-        title.append(" [").append(ircd).append("]");
+        title.append(" [").append(ircd).append(']');
         return title.toString();
     }
 

src/com/dmdirc/plugins/PluginInfo.java

@@ -52,6 +52,7 @@ import java.util.TreeMap;
 import javax.annotation.Nonnull;
 import javax.inject.Provider;
 
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import dagger.ObjectGraph;
@@ -61,7 +62,7 @@ import dagger.ObjectGraph;
  */
 public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
 
-    private static final org.slf4j.Logger log = LoggerFactory.getLogger(PluginInfo.class);
+    private static final Logger LOG = LoggerFactory.getLogger(PluginInfo.class);
     /** The metadata for this plugin. */
     private final PluginMetaData metaData;
     /** The initialiser to use for the injector. */
@@ -252,8 +253,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
     private void getDefaults() {
         final ConfigProvider defaults = identityController.getAddonSettings();
 
-        log.trace("{}: Using domain '{}'",
-                new Object[]{metaData.getName(), getDomain()});
+        LOG.trace("{}: Using domain '{}'", new Object[]{metaData.getName(), getDomain()});
 
         for (Map.Entry<String, String> entry : metaData.getDefaultSettings().entrySet()) {
             final String key = entry.getKey();
@@ -569,7 +569,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
      * @return True if the plugin was found and loaded, false otherwise
      */
     protected boolean loadRequiredPlugin(final String name) {
-        log.info("Loading required plugin '{}' for plugin {}",
+        LOG.info("Loading required plugin '{}' for plugin {}",
                 new Object[]{name, metaData.getName()});
 
         final PluginInfo pi = metaData.getManager().getPluginInfoByName(name);
@@ -746,7 +746,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
                     } else {
                         plugin = (Plugin) temp;
 
-                        log.debug("{}: Setting domain '{}'",
+                        LOG.debug("{}: Setting domain '{}'",
                                 new Object[]{metaData.getName(), getDomain()});
 
                         plugin.setDomain(getDomain());
@@ -831,13 +831,11 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
                 }
 
                 // Delete ourself as a child of our parent.
-                if (!parentUnloading) {
-                    if (metaData.getParent() != null) {
-                        final PluginInfo pi = metaData.getManager()
-                                .getPluginInfoByName(metaData.getParent());
-                        if (pi != null) {
-                            pi.delChild(this);
-                        }
+                if (!parentUnloading && metaData.getParent() != null) {
+                    final PluginInfo pi = metaData.getManager()
+                            .getPluginInfoByName(metaData.getParent());
+                    if (pi != null) {
+                        pi.delChild(this);
                     }
                 }
 

src/com/dmdirc/ui/core/feedback/CoreFeedbackDialogModel.java

@@ -175,29 +175,29 @@ public class CoreFeedbackDialogModel implements FeedbackDialogModel {
                     continue;
                 }
                 serverInfo.append("Actual name: ").append(connection.getParser()
-                        .getServerName()).append("\n");
+                        .getServerName()).append('\n');
                 serverInfo.append("Network: ").append(connection.getNetwork())
-                        .append("\n");
+                        .append('\n');
                 serverInfo.append("IRCd: ").append(connection.getParser()
                         .getServerSoftware()).append(" - ");
                 serverInfo.append(connection.getParser().getServerSoftwareType())
-                        .append("\n");
+                        .append('\n');
                 serverInfo.append("Modes: ").append(connection.getParser()
-                        .getBooleanChannelModes()).append(" ");
+                        .getBooleanChannelModes()).append(' ');
                 serverInfo.append(connection.getParser().getListChannelModes())
-                        .append(" ");
+                        .append(' ');
                 serverInfo.append(connection.getParser().getParameterChannelModes())
-                        .append(" ");
+                        .append(' ');
                 serverInfo.append(connection.getParser().
                         getDoubleParameterChannelModes());
             }
         }
         if (getIncludeDMDircInfo()) {
             dmdircInfo.append("DMDirc version: ").append(ClientInfo.getVersionInformation())
-                    .append("\n");
-            dmdircInfo.append("Profile directory: ").append(configDirectory).append("\n");
+                    .append('\n');
+            dmdircInfo.append("Profile directory: ").append(configDirectory).append('\n');
             dmdircInfo.append("Java version: ").append(ClientInfo.getJavaInformation())
-                    .append("\n");
+                    .append('\n');
             dmdircInfo.append("OS Version: ").append(ClientInfo.getOperatingSystemInformation());
         }
         final FeedbackSender sender = feedbackSenderFactory.getFeedbackSender(

src/com/dmdirc/ui/input/InputHandler.java

@@ -62,7 +62,7 @@ import org.slf4j.LoggerFactory;
  */
 public abstract class InputHandler implements ConfigChangeListener {
 
-    private static final Logger log = LoggerFactory.getLogger(InputHandler.class);
+    private static final Logger LOG = LoggerFactory.getLogger(InputHandler.class);
     /**
      * Indicates that the caret should be moved to the start of a selection when a control code has
      * been inserted.
@@ -291,18 +291,18 @@ public abstract class InputHandler implements ConfigChangeListener {
     /** Resets the composition state to idle and notifies the parent if relevant. */
     private void cancelTypingNotification() {
         if (compositionTimer != null) {
-            log.debug("Cancelling composition timer");
+            LOG.debug("Cancelling composition timer");
             compositionTimer.cancel();
         }
 
-        log.debug("Cancelling typing notification");
+        LOG.debug("Cancelling typing notification");
         setCompositionState(CompositionState.IDLE);
     }
 
     /** Updates the composition state to typing and starts/resets the idle timer. */
     private void updateTypingNotification() {
         if (compositionTimer != null) {
-            log.debug("Cancelling composition timer");
+            LOG.debug("Cancelling composition timer");
             compositionTimer.cancel();
         }
 
@@ -314,13 +314,13 @@ public abstract class InputHandler implements ConfigChangeListener {
             }
         }, TYPING_TIMEOUT);
 
-        log.debug("Setting composition state to typing. Timer scheduled for {}", TYPING_TIMEOUT);
+        LOG.debug("Setting composition state to typing. Timer scheduled for {}", TYPING_TIMEOUT);
         setCompositionState(CompositionState.TYPING);
     }
 
     /** Updates the composition state to "entered text". */
     private void timeoutTypingNotification() {
-        log.debug("Composition state timeout reached");
+        LOG.debug("Composition state timeout reached");
         setCompositionState(CompositionState.ENTERED_TEXT);
     }
 
@@ -485,15 +485,14 @@ public abstract class InputHandler implements ConfigChangeListener {
      */
     protected void doTabCompletion(final boolean shiftPressed) {
         if (tabCompleter == null || (flags & HANDLE_TABCOMPLETION) == 0) {
-            log.debug(
-                    "Aborting tab completion. Completer: {}, flags: {}",
+            LOG.debug("Aborting tab completion. Completer: {}, flags: {}",
                     new Object[]{tabCompleter, flags});
             return;
         }
 
         final String text = target.getText();
 
-        log.trace("Text for tab completion: {}", text);
+        LOG.trace("Text for tab completion: {}", text);
 
         if (text.isEmpty()) {
             doNormalTabCompletion(text, 0, 0, shiftPressed, null);
@@ -521,8 +520,7 @@ public abstract class InputHandler implements ConfigChangeListener {
             end = start;
         }
 
-        log.trace("Offsets: start: {}, end: {}",
-                new Object[]{start, end});
+        LOG.trace("Offsets: start: {}, end: {}", new Object[]{start, end});
 
         if (start > 0 && text.charAt(0) == commandController.getCommandChar()) {
             doCommandTabCompletion(text, start, end, shiftPressed);

src/com/dmdirc/updater/checking/DMDircCheckStrategy.java

@@ -40,6 +40,7 @@ import java.util.Map;
 
 import javax.inject.Inject;
 
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
@@ -47,7 +48,7 @@ import org.slf4j.LoggerFactory;
  */
 public class DMDircCheckStrategy implements UpdateCheckStrategy {
 
-    private static final org.slf4j.Logger log = LoggerFactory.getLogger(DMDircCheckStrategy.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DMDircCheckStrategy.class);
     /** The URL to request to check for updates. */
     private static final String UPDATE_URL = "http://updates.dmdirc.com/";
     /** The update channel to check for updates on. */
@@ -75,12 +76,12 @@ public class DMDircCheckStrategy implements UpdateCheckStrategy {
      */
     @ConfigBinding(domain = "updater", key = "channel")
     public void setChannel(final String channel) {
-        log.info("Changing channel to {}", channel);
+        LOG.info("Changing channel to {}", channel);
 
         try {
             this.channel = UpdateChannel.valueOf(channel.toUpperCase());
         } catch (IllegalArgumentException ex) {
-            log.warn("Unknown channel {}", channel, ex);
+            LOG.warn("Unknown channel {}", channel, ex);
         }
     }
 
@@ -92,13 +93,13 @@ public class DMDircCheckStrategy implements UpdateCheckStrategy {
 
         try {
             final List<String> response = downloader.getPage(UPDATE_URL, getPayload(components));
-            log.trace("Response from update server: {}", response);
+            LOG.trace("Response from update server: {}", response);
 
             for (String line : response) {
                 final UpdateComponent component = names.get(getComponent(line));
 
                 if (component == null) {
-                    log.warn("Unable to extract component from line: {}", line);
+                    LOG.warn("Unable to extract component from line: {}", line);
                     continue;
                 }
 
@@ -109,7 +110,7 @@ public class DMDircCheckStrategy implements UpdateCheckStrategy {
                 }
             }
         } catch (IOException ex) {
-            log.warn("I/O exception when checking for updates", ex);
+            LOG.warn("I/O exception when checking for updates", ex);
         }
 
         return res;
@@ -127,8 +128,8 @@ public class DMDircCheckStrategy implements UpdateCheckStrategy {
         final StringBuilder data = new StringBuilder("data=");
 
         for (UpdateComponent component : components) {
-            log.trace("Adding payload info for component {} (version {})",
-                    component.getName(), component.getVersion());
+            LOG.trace("Adding payload info for component {} (version {})", component.getName(),
+                    component.getVersion());
 
             data.append(component.getName());
             data.append(',');
@@ -138,7 +139,7 @@ public class DMDircCheckStrategy implements UpdateCheckStrategy {
             data.append(';');
         }
 
-        log.debug("Constructed update payload: {}", data);
+        LOG.debug("Constructed update payload: {}", data);
 
         return data.toString();
     }
@@ -175,10 +176,10 @@ public class DMDircCheckStrategy implements UpdateCheckStrategy {
             case "uptodate":
                 return new BaseCheckResult(component);
             case "error":
-                log.warn("Error received from update server: {}", line);
+                LOG.warn("Error received from update server: {}", line);
                 break;
             default:
-                log.error("Unknown update line received from server: {}", line);
+                LOG.error("Unknown update line received from server: {}", line);
                 break;
         }
 
@@ -199,7 +200,7 @@ public class DMDircCheckStrategy implements UpdateCheckStrategy {
             return new BaseDownloadableResult(component, new URL(parts[5]),
                     parts[4], new Version(parts[3]));
         } catch (MalformedURLException ex) {
-            log.error("Unable to construct URL for update. Parts: {}", parts, ex);
+            LOG.error("Unable to construct URL for update. Parts: {}", parts, ex);
             return null;
         }
     }

src/com/dmdirc/updater/manager/UpdateManagerImpl.java

@@ -42,6 +42,7 @@ import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.Executor;
 
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
@@ -49,7 +50,7 @@ import org.slf4j.LoggerFactory;
  */
 public class UpdateManagerImpl implements UpdateManager {
 
-    private static final org.slf4j.Logger log = LoggerFactory.getLogger(UpdateManagerImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(UpdateManagerImpl.class);
     /** Collection of known update checking strategies. */
     private final List<UpdateCheckStrategy> checkers = new CopyOnWriteArrayList<>();
     /** Collection of known update retrieval strategies. */
@@ -94,27 +95,27 @@ public class UpdateManagerImpl implements UpdateManager {
 
     @Override
     public void addCheckStrategy(final UpdateCheckStrategy strategy) {
-        log.trace("Adding new check strategy: {}", strategy);
+        LOG.trace("Adding new check strategy: {}", strategy);
         this.checkers.add(strategy);
     }
 
     @Override
     public void addRetrievalStrategy(final UpdateRetrievalStrategy strategy) {
-        log.trace("Adding new retrieval strategy: {}", strategy);
+        LOG.trace("Adding new retrieval strategy: {}", strategy);
         strategy.addUpdateRetrievalListener(retrievalListener);
         this.retrievers.add(strategy);
     }
 
     @Override
     public void addInstallationStrategy(final UpdateInstallationStrategy strategy) {
-        log.trace("Adding new installation strategy: {}", strategy);
+        LOG.trace("Adding new installation strategy: {}", strategy);
         strategy.addUpdateInstallationListener(installationListener);
         this.installers.add(strategy);
     }
 
     @Override
     public void addComponent(final UpdateComponent component) {
-        log.trace("Adding new component: {}", component);
+        LOG.trace("Adding new component: {}", component);
         synchronized (componentsLock) {
             this.components.put(component.getName(), component);
         }
@@ -122,7 +123,7 @@ public class UpdateManagerImpl implements UpdateManager {
 
     @Override
     public void removeComponent(final UpdateComponent component) {
-        log.trace("Removing component: {}", component);
+        LOG.trace("Removing component: {}", component);
         synchronized (componentsLock) {
             this.components.remove(component.getName());
         }
@@ -147,10 +148,10 @@ public class UpdateManagerImpl implements UpdateManager {
     public void checkForUpdates() {
         final Collection<Map<UpdateComponent, UpdateCheckResult>> results = new ArrayList<>();
 
-        log.info("Checking for updates for {} components using {} strategies",
-                components.size(), checkers.size());
-        log.trace("Components: {}", components);
-        log.trace("Strategies: {}", checkers);
+        LOG.info("Checking for updates for {} components using {} strategies", components.size(),
+                checkers.size());
+        LOG.trace("Components: {}", components);
+        LOG.trace("Strategies: {}", checkers);
 
         final List<UpdateComponent> enabledComponents = new ArrayList<>(components.size());
         final List<UpdateComponent> disabledComponents = new ArrayList<>(components.size());
@@ -160,7 +161,7 @@ public class UpdateManagerImpl implements UpdateManager {
                 if (policy.canCheck(component)) {
                     enabledComponents.add(component);
                 } else {
-                    log.debug("Checking for updates for {} denied by policy", component.getName());
+                    LOG.debug("Checking for updates for {} denied by policy", component.getName());
                     disabledComponents.add(component);
                 }
             }
@@ -186,7 +187,7 @@ public class UpdateManagerImpl implements UpdateManager {
         for (UpdateComponent component : enabledComponents) {
             if (checkResults.containsKey(component) && checkResults.get(component).
                     isUpdateAvailable()) {
-                log.trace("Update is available for {}", component);
+                LOG.trace("Update is available for {}", component);
                 listenerList.getCallable(UpdateStatusListener.class)
                         .updateStatusChanged(component, UpdateStatus.UPDATE_PENDING, 0);
             } else {
@@ -214,7 +215,7 @@ public class UpdateManagerImpl implements UpdateManager {
         } else {
             listenerList.getCallable(UpdateStatusListener.class)
                     .updateStatusChanged(component, UpdateStatus.INSTALL_PENDING, 0);
-            log.debug("Scheduling install for {}", update);
+            LOG.debug("Scheduling install for {}", update);
             executor.execute(new InstallationTask(strategy, update));
         }
     }
@@ -232,7 +233,7 @@ public class UpdateManagerImpl implements UpdateManager {
      */
     public void retrieve(final UpdateComponent component, final boolean install) {
         if (!checkResults.containsKey(component) || !checkResults.get(component).isUpdateAvailable()) {
-            log.warn("Tried to retrieve component with no update: {}", component);
+            LOG.warn("Tried to retrieve component with no update: {}", component);
             return;
         }
 
@@ -245,7 +246,7 @@ public class UpdateManagerImpl implements UpdateManager {
         } else {
             listenerList.getCallable(UpdateStatusListener.class)
                     .updateStatusChanged(component, UpdateStatus.UPDATE_PENDING, 0);
-            log.debug("Scheduling retrieval for {}", update);
+            LOG.debug("Scheduling retrieval for {}", update);
             executor.execute(new RetrievalTask(this, strategy, update, install));
         }
     }
@@ -256,7 +257,7 @@ public class UpdateManagerImpl implements UpdateManager {
      * @param result The result retrieved from the {@link UpdateRetrievalStrategy}.
      */
     protected void setRetrievalResult(final UpdateRetrievalResult result) {
-        log.debug("Received retrieval result {}", result);
+        LOG.debug("Received retrieval result {}", result);
         retrievalResults.put(result.getCheckResult().getComponent(), result);
     }
 
@@ -269,18 +270,18 @@ public class UpdateManagerImpl implements UpdateManager {
      * @return A relevant strategy, or <code>null</code> if none are available
      */
     protected UpdateRetrievalStrategy getStrategy(final UpdateCheckResult result) {
-        log.debug("Trying to find retrieval strategy for {}", result);
+        LOG.debug("Trying to find retrieval strategy for {}", result);
 
         for (UpdateRetrievalStrategy strategy : retrievers) {
-            log.trace("Testing strategy {}", strategy);
+            LOG.trace("Testing strategy {}", strategy);
 
             if (strategy.canHandle(result)) {
-                log.debug("Found strategy {}", strategy);
+                LOG.debug("Found strategy {}", strategy);
                 return strategy;
             }
         }
 
-        log.warn("No strategy found to retrieve {}", result);
+        LOG.warn("No strategy found to retrieve {}", result);
         return null;
     }
 
@@ -293,18 +294,18 @@ public class UpdateManagerImpl implements UpdateManager {
      * @return A relevant strategy, or <code>null</code> if none are available
      */
     protected UpdateInstallationStrategy getStrategy(final UpdateRetrievalResult result) {
-        log.debug("Trying to find installation strategy for {}", result);
+        LOG.debug("Trying to find installation strategy for {}", result);
 
         for (UpdateInstallationStrategy strategy : installers) {
-            log.trace("Testing strategy {}", strategy);
+            LOG.trace("Testing strategy {}", strategy);
 
             if (strategy.canHandle(result)) {
-                log.debug("Found strategy {}", strategy);
+                LOG.debug("Found strategy {}", strategy);
                 return strategy;
             }
         }
 
-        log.warn("No strategy found to install {}", result);
+        LOG.warn("No strategy found to install {}", result);
         return null;
     }
 

test/com/dmdirc/ServerManagerTest.java

@@ -198,7 +198,7 @@ public class ServerManagerTest {
 
         assertEquals(3, serverManager.getConnectionCount());
 
-        URI serverUri = uriCaptor.getValue();
+        final URI serverUri = uriCaptor.getValue();
         assertEquals("irc", serverUri.getScheme());
         assertEquals("irc.quakenet.org", serverUri.getHost());
         assertEquals("DMDirc", serverUri.getPath().substring(1));

test/com/dmdirc/WritableFrameContainerTest.java

@@ -111,8 +111,8 @@ public class WritableFrameContainerTest {
 
         for (String[][] test : tests) {
             final String[] res = container10.splitLine(test[0][0]).toArray(new String[0]);
-            assertTrue("'" + test[0][0] + "' → "
-                    + Arrays.toString(res) + " (expected: " + Arrays.toString(test[1]) + ")",
+            assertTrue('\'' + test[0][0] + "' → "
+                    + Arrays.toString(res) + " (expected: " + Arrays.toString(test[1]) + ')',
                     Arrays.equals(res, test[1]));
         }
     }

test/com/dmdirc/actions/ActionConditionTest.java

@@ -102,9 +102,9 @@ public class ActionConditionTest {
     public void testToString() {
         final ActionCondition ac1 = new ActionCondition("foobarbaz",
             CoreActionComparison.STRING_STARTSWITH, "foo");
-        assertTrue(ac1.toString().indexOf("foo") > -1);
-        assertTrue(ac1.toString().indexOf("foobarbaz") > -1);
-        assertTrue(ac1.toString().indexOf(CoreActionComparison.STRING_STARTSWITH.toString()) > -1);
+        assertTrue(ac1.toString().contains("foo"));
+        assertTrue(ac1.toString().contains("foobarbaz"));
+        assertTrue(ac1.toString().contains(CoreActionComparison.STRING_STARTSWITH.toString()));
     }
 
     @Test
@@ -116,7 +116,7 @@ public class ActionConditionTest {
 
         assertTrue(ac1.equals(ac2));
         assertTrue(ac2.equals(ac1));
-        assertFalse(ac1.equals(null));
+        assertFalse(ac1.equals(null)); // NOPMD
         assertFalse(ac1.equals("foo"));
         assertEquals(ac1.hashCode(), ac2.hashCode());
 

test/com/dmdirc/actions/ActionGroupTest.java

@@ -33,36 +33,36 @@ public class ActionGroupTest {
 
     @Test
     public void testGetAuthor() {
-        ActionGroup instance = new ActionGroup("moo");
+        final ActionGroup instance = new ActionGroup("moo");
         instance.setAuthor("foo");
 
-        String expResult = "foo";
-        String result = instance.getAuthor();
+        final String expResult = "foo";
+        final String result = instance.getAuthor();
         assertEquals(expResult, result);
     }
 
     @Test
     public void testGetDescription() {
-        ActionGroup instance = new ActionGroup("bar");
+        final ActionGroup instance = new ActionGroup("bar");
         instance.setDescription("Tra-la-la-la-la");
 
-        String expResult = "Tra-la-la-la-la";
-        String result = instance.getDescription();
+        final String expResult = "Tra-la-la-la-la";
+        final String result = instance.getDescription();
         assertEquals(expResult, result);
     }
 
     @Test
     public void testGetName() {
-        ActionGroup instance = new ActionGroup("foobar");
+        final ActionGroup instance = new ActionGroup("foobar");
 
-        String expResult = "foobar";
-        String result = instance.getName();
+        final String expResult = "foobar";
+        final String result = instance.getName();
         assertEquals(expResult, result);
     }
 
     @Test
     public void testGetSettings() {
-        ActionGroup instance = new ActionGroup("foo");
+        final ActionGroup instance = new ActionGroup("foo");
 
         assertTrue(instance.getSettings().isEmpty());
 
@@ -72,27 +72,27 @@ public class ActionGroupTest {
 
     @Test
     public void testGetVersion() {
-        ActionGroup instance = new ActionGroup("vtest");
+        final ActionGroup instance = new ActionGroup("vtest");
         instance.setVersion(new Version(73));
 
-        Version expResult = new Version(73);
-        Version result = instance.getVersion();
+        final Version expResult = new Version(73);
+        final Version result = instance.getVersion();
         assertEquals(expResult, result);
     }
 
     @Test
     public void testGetComponent() {
-        ActionGroup instance = new ActionGroup("zzz");
+        final ActionGroup instance = new ActionGroup("zzz");
         instance.setComponent(69);
 
-        int expResult = 69;
-        int result = instance.getComponent();
+        final int expResult = 69;
+        final int result = instance.getComponent();
         assertEquals(expResult, result);
     }
 
     @Test
     public void testClear() {
-        ActionGroup instance = new ActionGroup("zzz");
+        final ActionGroup instance = new ActionGroup("zzz");
         instance.add(null);
         assertTrue(instance.iterator().hasNext());
         instance.clear();
@@ -101,7 +101,7 @@ public class ActionGroupTest {
 
     @Test
     public void testRemove() {
-        ActionGroup instance = new ActionGroup("zzz");
+        final ActionGroup instance = new ActionGroup("zzz");
         instance.add(null);
         assertTrue(instance.iterator().hasNext());
         instance.remove(null);

test/com/dmdirc/actions/ActionModelTest.java

@@ -23,7 +23,6 @@
 package com.dmdirc.actions;
 
 import com.dmdirc.GlobalWindow;
-import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.actions.ActionType;
@@ -48,7 +47,6 @@ import static org.junit.Assert.assertTrue;
 @RunWith(MockitoJUnitRunner.class)
 public class ActionModelTest {
 
-    @Mock private Provider<GlobalCommandParser> gcpProvider;
     @Mock private Provider<GlobalWindow> gwProvider;
     @Mock private ActionSubstitutorFactory substitutorFactory;
     @Mock private ActionController actionController;
@@ -155,12 +153,10 @@ public class ActionModelTest {
         final ActionModel model = new ActionModel(gwProvider, substitutorFactory,
                 "group", "name",
                 new ActionType[]{CoreActionType.CHANNEL_ACTION},
-                new String[0], Arrays.asList(new ActionCondition[]{
-                    new ActionCondition(2, CoreActionComponent.STRING_STRING,
-                            CoreActionComparison.STRING_REGEX, ".*e{5}.*"),
-                    new ActionCondition(2, CoreActionComponent.STRING_STRING,
-                            CoreActionComparison.STRING_STARTSWITH, "abc"),
-                }), ConditionTree.parseString("0|1"), null);
+                new String[0], Arrays.asList(new ActionCondition(2, CoreActionComponent.STRING_STRING,
+                        CoreActionComparison.STRING_REGEX, ".*e{5}.*"),
+                new ActionCondition(2, CoreActionComponent.STRING_STRING,
+                        CoreActionComparison.STRING_STARTSWITH, "abc")), ConditionTree.parseString("0|1"), null);
         final ActionSubstitutor sub = new ActionSubstitutor(actionController,
                 commandController, configProvider, CoreActionType.CHANNEL_ACTION);
 
@@ -177,12 +173,10 @@ public class ActionModelTest {
         final ActionModel model = new ActionModel(gwProvider, substitutorFactory,
                 "group", "name",
                 new ActionType[]{CoreActionType.CHANNEL_ACTION},
-                new String[0], Arrays.asList(new ActionCondition[]{
-                    new ActionCondition(2, CoreActionComponent.STRING_STRING,
-                            CoreActionComparison.STRING_REGEX, ".*e{5}.*"),
-                    new ActionCondition(2, CoreActionComponent.STRING_STRING,
-                            CoreActionComparison.STRING_STARTSWITH, "abc"),
-                }), null, null);
+                new String[0], Arrays.asList(new ActionCondition(2, CoreActionComponent.STRING_STRING,
+                        CoreActionComparison.STRING_REGEX, ".*e{5}.*"),
+                new ActionCondition(2, CoreActionComponent.STRING_STRING,
+                        CoreActionComparison.STRING_STARTSWITH, "abc")), null, null);
         final ActionSubstitutor sub = new ActionSubstitutor(actionController, commandController,
                 configProvider, CoreActionType.CHANNEL_ACTION);
 

test/com/dmdirc/actions/ActionTest.java

@@ -24,7 +24,6 @@ package com.dmdirc.actions;
 
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.GlobalWindow;
-import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionController;
@@ -72,7 +71,6 @@ public class ActionTest {
     @Rule public final TemporaryFolder folder = new TemporaryFolder();
 
     @Mock private DMDircMBassador eventBus;
-    @Mock private Provider<GlobalCommandParser> gcpProvider;
     @Mock private Provider<GlobalWindow> gwProvider;
     @Mock private ActionSubstitutorFactory substitutorFactory;
     @Mock private ActionController actionController;
@@ -122,7 +120,7 @@ public class ActionTest {
 
     @Test
     public void testSetGroup() {
-        Action action = new Action(filesystem, eventBus, gwProvider,
+        final Action action = new Action(filesystem, eventBus, gwProvider,
                 substitutorFactory, actionController, identityController, getTempDirectory(),
                 "unit-test", "test1", new ActionType[0],
                 new String[0], new ArrayList<ActionCondition>(),
@@ -137,7 +135,7 @@ public class ActionTest {
 
     @Test
     public void testSetName() {
-        Action action = new Action(filesystem, eventBus, gwProvider,
+        final Action action = new Action(filesystem, eventBus, gwProvider,
                 substitutorFactory, actionController, identityController, getTempDirectory(),
                 "unit-test", "test1", new ActionType[0], new String[0],
                 new ArrayList<ActionCondition>(), ConditionTree.createConjunction(0), null);
@@ -151,7 +149,7 @@ public class ActionTest {
 
     @Test
     public void testDelete() {
-        Action action = new Action(filesystem, eventBus, gwProvider,
+        final Action action = new Action(filesystem, eventBus, gwProvider,
                 substitutorFactory, actionController, identityController, getTempDirectory(),
                 "unit-test", "test1", new ActionType[0],
                 new String[0], new ArrayList<ActionCondition>(),
@@ -164,7 +162,7 @@ public class ActionTest {
 
     @Test
     public void testRead() throws IOException, InvalidConfigFileException {
-        Action action = new Action(filesystem, eventBus, gwProvider,
+        final Action action = new Action(filesystem, eventBus, gwProvider,
                 substitutorFactory, actionController, identityController, getTempDirectory(),
                 "unit-test", "doesn't_exist");
         action.config = new ConfigFile(getClass().getResourceAsStream("action1"));
@@ -183,7 +181,7 @@ public class ActionTest {
 
     @Test
     public void testMultipleGroups() throws IOException, InvalidConfigFileException {
-        Action action = new Action(filesystem, eventBus, gwProvider,
+        final Action action = new Action(filesystem, eventBus, gwProvider,
                 substitutorFactory, actionController, identityController, getTempDirectory(),
                 "unit-test", "doesn't_exist");
         action.config = new ConfigFile(getClass().getResourceAsStream("action_multisettings"));

test/com/dmdirc/actions/ConditionTreeEvaluatorTest.java

@@ -36,7 +36,7 @@ public class ConditionTreeEvaluatorTest {
 
     private final Boolean[] data;
 
-    public ConditionTreeEvaluatorTest(Boolean[] data) {
+    public ConditionTreeEvaluatorTest(final Boolean[] data) {
         this.data = data;
     }
 

test/com/dmdirc/actions/ConditionTreeParserTest.java

@@ -36,7 +36,7 @@ public class ConditionTreeParserTest {
 
     private final String input, expected;
 
-    public ConditionTreeParserTest(String input, String expected) {
+    public ConditionTreeParserTest(final String input, final String expected) {
         this.input = input;
         this.expected = expected;
     }

test/com/dmdirc/actions/CoreActionComparisonTest.java

@@ -30,7 +30,7 @@ public class CoreActionComparisonTest {
     @Test
     public void testStringRegex() {
         assertEquals(String.class, CoreActionComparison.STRING_REGEX.appliesTo());
-        assertTrue(CoreActionComparison.STRING_REGEX.getName().toLowerCase().indexOf("reg") > -1);
+        assertTrue(CoreActionComparison.STRING_REGEX.getName().toLowerCase().contains("reg"));
         assertTrue(CoreActionComparison.STRING_REGEX.test("hello", "h.*?o"));
         assertFalse(CoreActionComparison.STRING_REGEX.test("hello", "h.{8}o"));
         assertFalse(CoreActionComparison.STRING_REGEX.test("hello", "?!!?!{}"));
@@ -39,7 +39,7 @@ public class CoreActionComparisonTest {
     @Test
     public void testStringEquals() {
         assertEquals(String.class, CoreActionComparison.STRING_EQUALS.appliesTo());
-        assertTrue(CoreActionComparison.STRING_EQUALS.getName().toLowerCase().indexOf("equal") > -1);
+        assertTrue(CoreActionComparison.STRING_EQUALS.getName().toLowerCase().contains("equal"));
         assertTrue(CoreActionComparison.STRING_EQUALS.test("hello", "hello"));
         assertTrue(CoreActionComparison.STRING_EQUALS.test("hello", "HELLO"));
         assertFalse(CoreActionComparison.STRING_EQUALS.test("hello", "h.{8}o"));
@@ -49,9 +49,9 @@ public class CoreActionComparisonTest {
     @Test
     public void testStringNEquals() {
         assertEquals(String.class, CoreActionComparison.STRING_NEQUALS.appliesTo());
-        assertTrue(CoreActionComparison.STRING_NEQUALS.getName().toLowerCase().indexOf("equal") > -1);
-        assertTrue(CoreActionComparison.STRING_NEQUALS.getName().toLowerCase().indexOf("not") > -1
-                || CoreActionComparison.STRING_NEQUALS.getName().toLowerCase().indexOf("n't") > -1);
+        assertTrue(CoreActionComparison.STRING_NEQUALS.getName().toLowerCase().contains("equal"));
+        assertTrue(CoreActionComparison.STRING_NEQUALS.getName().toLowerCase().contains("not")
+                || CoreActionComparison.STRING_NEQUALS.getName().toLowerCase().contains("n't"));
         assertFalse(CoreActionComparison.STRING_NEQUALS.test("hello", "hello"));
         assertFalse(CoreActionComparison.STRING_NEQUALS.test("hello", "HELLO"));
         assertTrue(CoreActionComparison.STRING_NEQUALS.test("hello", "h.{8}o"));
@@ -61,8 +61,7 @@ public class CoreActionComparisonTest {
     @Test
     public void testStringStartsWith() {
         assertEquals(String.class, CoreActionComparison.STRING_STARTSWITH.appliesTo());
-        assertTrue(CoreActionComparison.STRING_STARTSWITH.getName().toLowerCase()
-                .indexOf("start") > -1);
+        assertTrue(CoreActionComparison.STRING_STARTSWITH.getName().toLowerCase().contains("start"));
         assertTrue(CoreActionComparison.STRING_STARTSWITH.test("hello", "hello"));
         assertTrue(CoreActionComparison.STRING_STARTSWITH.test("hello", "he"));
         assertFalse(CoreActionComparison.STRING_STARTSWITH.test("hello", "h.{8}o"));
@@ -72,8 +71,7 @@ public class CoreActionComparisonTest {
     @Test
     public void testStringContains() {
         assertEquals(String.class, CoreActionComparison.STRING_CONTAINS.appliesTo());
-        assertTrue(CoreActionComparison.STRING_CONTAINS.getName().toLowerCase()
-                .indexOf("contain") > -1);
+        assertTrue(CoreActionComparison.STRING_CONTAINS.getName().toLowerCase().contains("contain"));
         assertTrue(CoreActionComparison.STRING_CONTAINS.test("hello", "hello"));
         assertTrue(CoreActionComparison.STRING_CONTAINS.test("hello", "lo"));
         assertFalse(CoreActionComparison.STRING_CONTAINS.test("hello", "h.{8}o"));
@@ -83,10 +81,10 @@ public class CoreActionComparisonTest {
     @Test
     public void testStringNContains() {
         assertEquals(String.class, CoreActionComparison.STRING_NCONTAINS.appliesTo());
-        assertTrue(CoreActionComparison.STRING_NCONTAINS.getName().toLowerCase()
-                .indexOf("contain") > -1);
-        assertTrue(CoreActionComparison.STRING_NCONTAINS.getName().toLowerCase().indexOf("not") > -1
-                || CoreActionComparison.STRING_NCONTAINS.getName().toLowerCase().indexOf("n't") > -1);
+        assertTrue(
+                CoreActionComparison.STRING_NCONTAINS.getName().toLowerCase().contains("contain"));
+        assertTrue(CoreActionComparison.STRING_NCONTAINS.getName().toLowerCase().contains("not")
+                || CoreActionComparison.STRING_NCONTAINS.getName().toLowerCase().contains("n't"));
         assertFalse(CoreActionComparison.STRING_NCONTAINS.test("hello", "hello"));
         assertFalse(CoreActionComparison.STRING_NCONTAINS.test("hello", "lo"));
         assertTrue(CoreActionComparison.STRING_NCONTAINS.test("hello", "h.{8}o"));
@@ -96,8 +94,7 @@ public class CoreActionComparisonTest {
     @Test
     public void testBoolIs() {
         assertEquals(Boolean.class, CoreActionComparison.BOOL_IS.appliesTo());
-        assertTrue(CoreActionComparison.BOOL_IS.getName().toLowerCase()
-                .indexOf("is") > -1);
+        assertTrue(CoreActionComparison.BOOL_IS.getName().toLowerCase().contains("is"));
         assertTrue(CoreActionComparison.BOOL_IS.test(Boolean.TRUE, "true"));
         assertTrue(CoreActionComparison.BOOL_IS.test(Boolean.FALSE, "false"));
         assertFalse(CoreActionComparison.BOOL_IS.test(Boolean.FALSE, "true"));

test/com/dmdirc/actions/wrappers/ProfileTest.java

@@ -67,7 +67,7 @@ public class ProfileTest {
      */
     @Test
     public void testEmptyConstructor() {
-        Profile instance = new Profile("New Profile", identityFactory);
+        final Profile instance = new Profile("New Profile", identityFactory);
         assertEquals("", instance.getIdent());
         assertEquals("New Profile", instance.getName());
         assertEquals(new ArrayList<>(Arrays.asList("NewProfile")), instance.getNicknames());
@@ -79,7 +79,7 @@ public class ProfileTest {
      */
     @Test
     public void testIdentityConstructor() {
-        Profile instance = createProfile();
+        final Profile instance = createProfile();
         assertEquals("ident", instance.getIdent());
         assertEquals("profile", instance.getName());
         assertTrue(Arrays.asList(new String[]{"nickname1", "nickname2", })
@@ -91,8 +91,8 @@ public class ProfileTest {
      * Test of addNickname method, of class Profile.
      */
     @Test
-    public void testAddNickname_String() {
-        Profile instance = createProfile();
+    public void testAddNicknameString() {
+        final Profile instance = createProfile();
         instance.addNickname("nickname3");
         assertTrue(Arrays.asList(new String[]{"nickname1", "nickname2",
             "nickname3"}).equals(instance.getNicknames()));
@@ -102,8 +102,8 @@ public class ProfileTest {
      * Test of addNickname method, of class Profile.
      */
     @Test
-    public void testAddNickname_String_Contains() {
-        Profile instance = createProfile();
+    public void testAddNicknameStringContains() {
+        final Profile instance = createProfile();
         instance.addNickname("nickname2");
         assertTrue(Arrays.asList(new String[]{"nickname1", "nickname2"})
                 .equals(instance.getNicknames()));
@@ -113,8 +113,8 @@ public class ProfileTest {
      * Test of addNickname method, of class Profile.
      */
     @Test
-    public void testAddNickname_String_int() {
-        Profile instance = createProfile();
+    public void testAddNicknameStringInt() {
+        final Profile instance = createProfile();
         instance.addNickname("nickname3", 0);
         assertTrue(Arrays.asList(new String[]{"nickname3", "nickname1",
             "nickname2"}).equals(instance.getNicknames()));
@@ -124,8 +124,8 @@ public class ProfileTest {
      * Test of addNickname method, of class Profile.
      */
     @Test
-    public void testAddNickname_String_int_Contains() {
-        Profile instance = createProfile();
+    public void testAddNicknameStringIntContains() {
+        final Profile instance = createProfile();
         instance.addNickname("nickname2", 0);
         assertTrue(Arrays.asList(new String[]{"nickname1","nickname2"})
                 .equals(instance.getNicknames()));
@@ -136,7 +136,7 @@ public class ProfileTest {
      */
     @Test
     public void testDelNickname() {
-        Profile instance = createProfile();
+        final Profile instance = createProfile();
         instance.delNickname("nickname2");
         assertTrue(Arrays.asList(new String[]{"nickname1"})
                 .equals(instance.getNicknames()));
@@ -157,7 +157,7 @@ public class ProfileTest {
         when(configProvider.getOption("profile", "realname")).thenReturn("realname");
         when(configProvider.getOption("profile", "ident")).thenReturn("ident");
 
-        Profile instance = new Profile(identityFactory, configProvider);
+        final Profile instance = new Profile(identityFactory, configProvider);
         instance.save();
         verify(configProvider).setOption("identity", "name", "profile");
         verify(configProvider).setOption("profile", "nicknames", nicknames);
@@ -171,7 +171,7 @@ public class ProfileTest {
 
         when(identityFactory.createProfileConfig("New Profile")).thenReturn(configProvider);
 
-        Profile instance = new Profile("New Profile", identityFactory);
+        final Profile instance = new Profile("New Profile", identityFactory);
         instance.save();
         verify(identityFactory).createProfileConfig("New Profile");
     }
@@ -181,7 +181,7 @@ public class ProfileTest {
      */
     @Test
     public void testEditNicknameOldEmpty() {
-        Profile instance = createProfile();
+        final Profile instance = createProfile();
         instance.editNickname("", "nickname3");
         assertTrue(Arrays.asList(new String[]{"nickname1", "nickname2"})
                 .equals(instance.getNicknames()));
@@ -192,7 +192,7 @@ public class ProfileTest {
      */
     @Test
     public void testEditNicknameNewEmpty() {
-        Profile instance = createProfile();
+        final Profile instance = createProfile();
         instance.editNickname("nickname2", "");
         assertTrue(Arrays.asList(new String[]{"nickname1", "nickname2"})
                 .equals(instance.getNicknames()));
@@ -203,7 +203,7 @@ public class ProfileTest {
      */
     @Test
     public void testEditNicknameSame() {
-        Profile instance = createProfile();
+        final Profile instance = createProfile();
         instance.editNickname("nickname2", "nickname2");
         assertTrue(Arrays.asList(new String[]{"nickname1", "nickname2"})
                 .equals(instance.getNicknames()));
@@ -214,7 +214,7 @@ public class ProfileTest {
      */
     @Test
     public void testEditNickname() {
-        Profile instance = createProfile();
+        final Profile instance = createProfile();
         instance.editNickname("nickname2", "nickname3");
         assertTrue(Arrays.asList(new String[]{"nickname1", "nickname3"})
                 .equals(instance.getNicknames()));
@@ -235,7 +235,7 @@ public class ProfileTest {
         when(configProvider.getOption("profile", "realname")).thenReturn("realname");
         when(configProvider.getOption("profile", "ident")).thenReturn("ident");
 
-        Profile instance = new Profile(identityFactory, configProvider);
+        final Profile instance = new Profile(identityFactory, configProvider);
         instance.delete();
         verify(configProvider).delete();
     }
@@ -245,7 +245,7 @@ public class ProfileTest {
      */
     @Test
     public void testDeleteNullIdentity() throws IOException {
-        Profile instance = new Profile("New Profile", null);
+        final Profile instance = new Profile("New Profile", null);
         instance.delete();
     }
 }

test/com/dmdirc/commandparser/CommandArgumentsTest.java

@@ -103,9 +103,9 @@ public class CommandArgumentsTest {
         final char c = '/';
         final char s = '.';
 
-        assertTrue(new CommandArguments(controller, c + "" + s).isSilent());
+        assertTrue(new CommandArguments(controller, Character.toString(c) + s).isSilent());
         assertFalse(new CommandArguments(controller, "f" + s).isSilent());
-        assertTrue(new CommandArguments(controller, c + "" + s + "foo").isSilent());
+        assertTrue(new CommandArguments(controller, Character.toString(c) + s + "foo").isSilent());
         assertFalse(new CommandArguments(controller, "").isSilent());
         assertFalse(new CommandArguments(controller, "foo").isSilent());
     }

test/com/dmdirc/commandparser/commands/flags/CommandFlagHandlerTest.java

@@ -39,26 +39,26 @@ import static org.mockito.Mockito.*;
 @RunWith(Parameterized.class)
 public class CommandFlagHandlerTest {
 
-    private static final CommandFlag noArgsFlag1 = new CommandFlag("noargs1");
-    private static final CommandFlag noArgsFlag2 = new CommandFlag("noargs2", false);
-    private static final CommandFlag noArgsFlag3 = new CommandFlag("noargs3");
-    private static final CommandFlag noArgsFlag4 = new CommandFlag("noargs4", false);
-    private static final CommandFlag immArgsFlag1 = new CommandFlag("immargs1", true, 1, 0);
-    private static final CommandFlag immArgsFlag2 = new CommandFlag("immargs2", true, 2, 0);
-    private static final CommandFlag defArgsFlag1 = new CommandFlag("defargs1", true, 0, 1);
-    private static final CommandFlag defArgsFlag2 = new CommandFlag("defargs2", true, 0, 2);
+    private static final CommandFlag NO_ARGS_FLAG_1 = new CommandFlag("noargs1");
+    private static final CommandFlag NO_ARGS_FLAG_2 = new CommandFlag("noargs2", false);
+    private static final CommandFlag NO_ARGS_FLAG_3 = new CommandFlag("noargs3");
+    private static final CommandFlag NO_ARGS_FLAG_4 = new CommandFlag("noargs4", false);
+    private static final CommandFlag IMM_ARGS_FLAG_1 = new CommandFlag("immargs1", true, 1, 0);
+    private static final CommandFlag IMM_ARGS_FLAG_2 = new CommandFlag("immargs2", true, 2, 0);
+    private static final CommandFlag DEF_ARGS_FLAG_1 = new CommandFlag("defargs1", true, 0, 1);
+    private static final CommandFlag DEF_ARGS_FLAG_2 = new CommandFlag("defargs2", true, 0, 2);
     private final CommandFlagHandler handler;
 
     private final String input;
     private final CommandFlag[] flags;
     private final int[] offsets;
 
-    public CommandFlagHandlerTest(String input, CommandFlag[] flags, int[] offsets) {
-        noArgsFlag3.addEnabled(noArgsFlag4);
-        noArgsFlag3.addDisabled(noArgsFlag1);
+    public CommandFlagHandlerTest(final String input, final CommandFlag[] flags, final int[] offsets) {
+        NO_ARGS_FLAG_3.addEnabled(NO_ARGS_FLAG_4);
+        NO_ARGS_FLAG_3.addDisabled(NO_ARGS_FLAG_1);
 
-        handler = new CommandFlagHandler(noArgsFlag1, noArgsFlag2, noArgsFlag3,
-                noArgsFlag4, immArgsFlag1, immArgsFlag2, defArgsFlag1, defArgsFlag2);
+        handler = new CommandFlagHandler(NO_ARGS_FLAG_1, NO_ARGS_FLAG_2, NO_ARGS_FLAG_3,
+                NO_ARGS_FLAG_4, IMM_ARGS_FLAG_1, IMM_ARGS_FLAG_2, DEF_ARGS_FLAG_1, DEF_ARGS_FLAG_2);
 
         this.input = input;
         this.flags = flags;
@@ -103,14 +103,14 @@ public class CommandFlagHandlerTest {
     public static List<Object[]> data() {
         final Object[][] tests = {
             {"/foo", new CommandFlag[0], new int[]{0}},
-            {"/foo --noargs1", new CommandFlag[]{noArgsFlag1}, new int[]{1, 1}},
+            {"/foo --noargs1", new CommandFlag[]{NO_ARGS_FLAG_1}, new int[]{1, 1}},
             {"/foo --noargs2", null, null},
-            {"/foo --noargs3", new CommandFlag[]{noArgsFlag3}, new int[]{1, 1}},
+            {"/foo --noargs3", new CommandFlag[]{NO_ARGS_FLAG_3}, new int[]{1, 1}},
             {"/foo --noargs4", null, null},
             {"/foo --noargs5", new CommandFlag[0], new int[]{0}},
-            {"/foo --noargs3 --noargs4", new CommandFlag[]{noArgsFlag3, noArgsFlag4}, new int[]{1, 2, 2}},
+            {"/foo --noargs3 --noargs4", new CommandFlag[]{NO_ARGS_FLAG_3, NO_ARGS_FLAG_4}, new int[]{1, 2, 2}},
             {"/foo --noargs3 --noargs1", null, null},
-            {"/foo --noargs1 --noargs3", new CommandFlag[]{noArgsFlag1, noArgsFlag3}, new int[]{1, 2, 2}},
+            {"/foo --noargs1 --noargs3", new CommandFlag[]{NO_ARGS_FLAG_1, NO_ARGS_FLAG_3}, new int[]{1, 2, 2}},
             {"/foo --noargs3 --noargs4 --noargs1", null, null},
             {"/foo --noargs3 --noargs4 --noargs2", null, null},
 
@@ -118,20 +118,20 @@ public class CommandFlagHandlerTest {
             {"/foo --noargs1 --immargs1", null, null},
             {"/foo --immargs2", null, null},
             {"/foo --immargs2 xxx", null, null},
-            {"/foo --immargs1 arg1", new CommandFlag[]{immArgsFlag1}, new int[]{1, 2}},
-            {"/foo --noargs1 --immargs1 arg1", new CommandFlag[]{immArgsFlag1, noArgsFlag1},
+            {"/foo --immargs1 arg1", new CommandFlag[]{IMM_ARGS_FLAG_1}, new int[]{1, 2}},
+            {"/foo --noargs1 --immargs1 arg1", new CommandFlag[]{IMM_ARGS_FLAG_1, NO_ARGS_FLAG_1},
                     new int[]{2, 1, 3}},
-            {"/foo --immargs1 arg1 --noargs1", new CommandFlag[]{immArgsFlag1, noArgsFlag1},
+            {"/foo --immargs1 arg1 --noargs1", new CommandFlag[]{IMM_ARGS_FLAG_1, NO_ARGS_FLAG_1},
                     new int[]{1, 3, 3}},
 
             {"/foo --defargs1", null, null},
             {"/foo --noargs1 --defargs1", null, null},
             {"/foo --defargs2", null, null},
             {"/foo --defargs2 xxx", null, null},
-            {"/foo --defargs1 arg1", new CommandFlag[]{defArgsFlag1}, new int[]{1, 2}},
-            {"/foo --noargs1 --defargs1 arg1", new CommandFlag[]{defArgsFlag1, noArgsFlag1},
+            {"/foo --defargs1 arg1", new CommandFlag[]{DEF_ARGS_FLAG_1}, new int[]{1, 2}},
+            {"/foo --noargs1 --defargs1 arg1", new CommandFlag[]{DEF_ARGS_FLAG_1, NO_ARGS_FLAG_1},
                     new int[]{2, 1, 3}},
-            {"/foo --defargs1 --noargs1 arg1", new CommandFlag[]{defArgsFlag1, noArgsFlag1},
+            {"/foo --defargs1 --noargs1 arg1", new CommandFlag[]{DEF_ARGS_FLAG_1, NO_ARGS_FLAG_1},
                     new int[]{2, 2, 3}},
         };
 

test/com/dmdirc/config/ConfigTargetTest.java

@@ -32,7 +32,7 @@ public class ConfigTargetTest {
     public void testDefault() {
         final ConfigTarget target = new ConfigTarget();
 
-        assertEquals(target.getType(), ConfigTarget.TYPE.GLOBAL);
+        assertEquals(ConfigTarget.TYPE.GLOBAL, target.getType());
         assertTrue(target.toString().toLowerCase().matches("global.*config"));
     }
 
@@ -41,8 +41,8 @@ public class ConfigTargetTest {
         final ConfigTarget target = new ConfigTarget();
         target.setGlobal();
 
-        assertEquals(target.getType(), ConfigTarget.TYPE.GLOBAL);
-        assertEquals(target.getTypeName(), "global");
+        assertEquals(ConfigTarget.TYPE.GLOBAL, target.getType());
+        assertEquals("global", target.getTypeName());
         assertTrue(target.toString().toLowerCase().matches("global.*config"));
     }
 
@@ -51,8 +51,8 @@ public class ConfigTargetTest {
         final ConfigTarget target = new ConfigTarget();
         target.setGlobalDefault();
 
-        assertEquals(target.getType(), ConfigTarget.TYPE.GLOBALDEFAULT);
-        assertEquals(target.getTypeName(), "globaldefault");
+        assertEquals(ConfigTarget.TYPE.GLOBALDEFAULT, target.getType());
+        assertEquals("globaldefault", target.getTypeName());
         assertTrue(target.toString().toLowerCase().matches("global.*defaults"));
     }
 
@@ -61,8 +61,8 @@ public class ConfigTargetTest {
         final ConfigTarget target = new ConfigTarget();
         target.setTheme();
 
-        assertEquals(target.getType(), ConfigTarget.TYPE.THEME);
-        assertEquals(target.getTypeName(), "theme");
+        assertEquals(ConfigTarget.TYPE.THEME, target.getType());
+        assertEquals("theme", target.getTypeName());
         assertTrue(target.toString().toLowerCase().matches("theme"));
     }
 
@@ -71,8 +71,8 @@ public class ConfigTargetTest {
         final ConfigTarget target = new ConfigTarget();
         target.setCustom("profile");
 
-        assertEquals(target.getType(), ConfigTarget.TYPE.CUSTOM);
-        assertEquals(target.getTypeName(), "custom");
+        assertEquals(ConfigTarget.TYPE.CUSTOM, target.getType());
+        assertEquals("custom", target.getTypeName());
         assertEquals("profile", target.getData());
         assertEquals("custom: profile", target.toString().toLowerCase());
     }
@@ -82,9 +82,9 @@ public class ConfigTargetTest {
         final ConfigTarget target = new ConfigTarget();
         target.setProtocol("irc");
 
-        assertEquals(target.getType(), ConfigTarget.TYPE.PROTOCOL);
-        assertEquals(target.getTypeName(), "protocol");
-        assertEquals(target.getData(), "irc");
+        assertEquals(ConfigTarget.TYPE.PROTOCOL, target.getType());
+        assertEquals("protocol", target.getTypeName());
+        assertEquals("irc", target.getData());
         assertTrue(target.toString().toLowerCase().matches("protocol.*: irc"));
     }
 
@@ -93,9 +93,9 @@ public class ConfigTargetTest {
         final ConfigTarget target = new ConfigTarget();
         target.setIrcd("ircd_name");
 
-        assertEquals(target.getType(), ConfigTarget.TYPE.IRCD);
-        assertEquals(target.getTypeName(), "ircd");
-        assertEquals(target.getData(), "ircd_name");
+        assertEquals(ConfigTarget.TYPE.IRCD, target.getType());
+        assertEquals("ircd", target.getTypeName());
+        assertEquals("ircd_name", target.getData());
         assertTrue(target.toString().toLowerCase().matches("ircd.*: ircd_name"));
     }
 
@@ -104,9 +104,9 @@ public class ConfigTargetTest {
         final ConfigTarget target = new ConfigTarget();
         target.setNetwork("net_name");
 
-        assertEquals(target.getType(), ConfigTarget.TYPE.NETWORK);
-        assertEquals(target.getTypeName(), "network");
-        assertEquals(target.getData(), "net_name");
+        assertEquals(ConfigTarget.TYPE.NETWORK, target.getType());
+        assertEquals("network", target.getTypeName());
+        assertEquals("net_name", target.getData());
         assertTrue(target.toString().toLowerCase().matches("network.*: net_name"));
     }
 
@@ -115,9 +115,9 @@ public class ConfigTargetTest {
         final ConfigTarget target = new ConfigTarget();
         target.setServer("server_name");
 
-        assertEquals(target.getType(), ConfigTarget.TYPE.SERVER);
-        assertEquals(target.getTypeName(), "server");
-        assertEquals(target.getData(), "server_name");
+        assertEquals(ConfigTarget.TYPE.SERVER, target.getType());
+        assertEquals("server", target.getTypeName());
+        assertEquals("server_name", target.getData());
         assertTrue(target.toString().toLowerCase().matches("server.*: server_name"));
     }
 
@@ -126,9 +126,9 @@ public class ConfigTargetTest {
         final ConfigTarget target = new ConfigTarget();
         target.setChannel("channel_name");
 
-        assertEquals(target.getType(), ConfigTarget.TYPE.CHANNEL);
-        assertEquals(target.getTypeName(), "channel");
-        assertEquals(target.getData(), "channel_name");
+        assertEquals(ConfigTarget.TYPE.CHANNEL, target.getType());
+        assertEquals("channel", target.getTypeName());
+        assertEquals("channel_name", target.getData());
         assertTrue(target.toString().toLowerCase().matches("channel.*: channel_name"));
     }
 

test/com/dmdirc/config/prefs/PreferencesSettingTest.java

@@ -52,7 +52,7 @@ public class PreferencesSettingTest {
 
     @Test
     public void testNormalConstructor() {
-        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
+        final AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("fallback");
         final PreferencesSetting ps = new PreferencesSetting(PreferencesType.TEXT, "domain",
                 "option", "title", "helptext", cm, null);
@@ -67,7 +67,7 @@ public class PreferencesSettingTest {
 
     @Test
     public void testValidatorConstructor() {
-        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
+        final AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("fallback");
         final PreferencesSetting ps = new PreferencesSetting(PreferencesType.TEXT,
                 new NotEmptyValidator(), "domain",
@@ -83,7 +83,7 @@ public class PreferencesSettingTest {
 
     @Test
     public void testRestartNeeded() {
-        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
+        final AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("fallback");
         final PreferencesSetting ps = new PreferencesSetting(PreferencesType.TEXT, "domain",
                 "option", "title", "helptext", cm, null);
@@ -95,7 +95,7 @@ public class PreferencesSettingTest {
 
     @Test
     public void testMultichoiceAdding() {
-        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
+        final AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("new");
         final Map<String, String> map = new HashMap<>();
         map.put("a", "b");
@@ -110,7 +110,7 @@ public class PreferencesSettingTest {
 
     @Test
     public void testSetValue() {
-        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
+        final AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("fallback");
         final PreferencesSetting ps = new PreferencesSetting(PreferencesType.TEXT, "domain",
                 "option", "title", "helptext", cm, null);
@@ -120,7 +120,7 @@ public class PreferencesSettingTest {
 
     @Test
     public void testDismiss() {
-        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
+        final AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("fallback");
         final PreferencesSetting ps = new PreferencesSetting(PreferencesType.TEXT, "domain",
                 "option", "title", "helptext", cm, null);
@@ -137,7 +137,7 @@ public class PreferencesSettingTest {
 
     @Test
     public void testListener() {
-        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
+        final AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("fallback");
         final PreferencesSetting ps = new PreferencesSetting(PreferencesType.TEXT, "domain",
                 "option", "title", "helptext", cm, null);
@@ -152,7 +152,7 @@ public class PreferencesSettingTest {
 
     @Test
     public void testNeedsSaving() {
-        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
+        final AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("fallback");
         when(cm.getOption("domain", "option2")).thenReturn("fallback");
         final PreferencesSetting ps = new PreferencesSetting(PreferencesType.TEXT,
@@ -173,8 +173,8 @@ public class PreferencesSettingTest {
 
     @Test
     public void testSaveUnset() {
-        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
-        ConfigProvider configProvider = mock(ConfigProvider.class);
+        final AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
+        final ConfigProvider configProvider = mock(ConfigProvider.class);
 
         when(cm.getOption("unit-test", "ps")).thenReturn("abc");
         when(configProvider.getOption("unit-test", "ps")).thenReturn("abc");
@@ -191,8 +191,8 @@ public class PreferencesSettingTest {
 
     @Test
     public void testSaveNormal() {
-        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
-        ConfigProvider configProvider = mock(ConfigProvider.class);
+        final AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
+        final ConfigProvider configProvider = mock(ConfigProvider.class);
 
         when(cm.getOption("unit-test", "ps")).thenReturn("abc");
         when(configProvider.getOption("unit-test", "ps")).thenReturn("abc");
@@ -209,8 +209,8 @@ public class PreferencesSettingTest {
 
     @Test
     public void testIsSet() {
-        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
-        ConfigProvider configProvider = mock(ConfigProvider.class);
+        final AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
+        final ConfigProvider configProvider = mock(ConfigProvider.class);
 
         when(cm.getOption("unit-test", "ps")).thenReturn("abc");
         when(configProvider.getOption("unit-test", "ps")).thenReturn("abc");
@@ -223,8 +223,8 @@ public class PreferencesSettingTest {
 
     @Test
     public void testIsNotSet() {
-        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
-        ConfigProvider identity = mock(ConfigProvider.class);
+        final AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
+        final ConfigProvider identity = mock(ConfigProvider.class);
 
         when(cm.getOption("unit-test", "ps")).thenReturn(null);
         when(identity.getOption("unit-test", "ps")).thenReturn(null);
@@ -237,8 +237,8 @@ public class PreferencesSettingTest {
 
     @Test
     public void testUnknownComboOption() {
-        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
-        ConfigProvider configProvider = mock(ConfigProvider.class);
+        final AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
+        final ConfigProvider configProvider = mock(ConfigProvider.class);
 
         when(cm.getOption("unit-test", "ps")).thenReturn("abc");
         when(configProvider.getOption("unit-test", "ps")).thenReturn("abc");
@@ -253,8 +253,8 @@ public class PreferencesSettingTest {
 
     @Test
     public void testKnownComboOption() {
-        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
-        ConfigProvider configProvider = mock(ConfigProvider.class);
+        final AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
+        final ConfigProvider configProvider = mock(ConfigProvider.class);
 
         when(cm.getOption("unit-test", "ps")).thenReturn("abc");
         when(configProvider.getOption("unit-test", "ps")).thenReturn("abc");

test/com/dmdirc/harness/TestCommandParser.java

@@ -59,32 +59,32 @@ public class TestCommandParser extends CommandParser {
     }
 
     @Override
-    protected void executeCommand(@Nonnull FrameContainer origin, CommandInfo commandInfo, Command command,
-            CommandArguments args, CommandContext context) {
+    protected void executeCommand(@Nonnull final FrameContainer origin, final CommandInfo commandInfo, final Command command,
+            final CommandArguments args, final CommandContext context) {
         executedCommand = command;
         wasSilent = args.isSilent();
         commandArgs = args;
     }
 
     @Override
-    protected CommandContext getCommandContext(FrameContainer origin, CommandInfo commandInfo,
-            Command command, CommandArguments args) {
+    protected CommandContext getCommandContext(final FrameContainer origin, final CommandInfo commandInfo,
+            final Command command, final CommandArguments args) {
         return new CommandContext(origin, commandInfo);
     }
 
     @Override
-    protected void handleNonCommand(FrameContainer origin, String line) {
+    protected void handleNonCommand(final FrameContainer origin, final String line) {
         nonCommandLine = line;
     }
 
     @Override
-    protected void handleInvalidCommand(FrameContainer origin,
-            CommandArguments args) {
+    protected void handleInvalidCommand(final FrameContainer origin,
+            final CommandArguments args) {
         invalidCommand = args.getCommandName();
     }
 
     @Override
-    public void setOwner(FrameContainer owner) {
+    public void setOwner(final FrameContainer owner) {
         // Don't care
     }
 

test/com/dmdirc/harness/TestConfigSource.java

@@ -30,17 +30,17 @@ import java.util.Map;
 public class TestConfigSource extends BaseConfigProvider {
 
     @Override
-    public boolean hasOption(String domain, String option, Validator<String> validator) {
+    public boolean hasOption(final String domain, final String option, final Validator<String> validator) {
         return Boolean.parseBoolean(domain);
     }
 
     @Override
-    public String getOption(String domain, String option, Validator<String> validator) {
+    public String getOption(final String domain, final String option, final Validator<String> validator) {
         return option;
     }
 
     @Override
-    public Map<String, String> getOptions(String domain) {
+    public Map<String, String> getOptions(final String domain) {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 }

test/com/dmdirc/logger/DMDircExceptionHandlerTest.java

@@ -44,14 +44,14 @@ public class DMDircExceptionHandlerTest {
 
     @Test
     public void testUncaughtException() {
-        final Exception exception = new Exception();
+        final Exception exception = new UnsupportedOperationException();
         eh.uncaughtException(null, exception);
         verify(errorManager).addError(eq(ErrorLevel.HIGH), anyString(), same(exception), eq(true));
     }
 
     @Test
     public void testUncaughtError() {
-        final Error error = new Error();
+        final Error error = new OutOfMemoryError();
         eh.uncaughtException(null, error);
         verify(errorManager).addError(eq(ErrorLevel.FATAL), anyString(), same(error), eq(true));
     }

test/com/dmdirc/logger/ProgramErrorTest.java

@@ -71,20 +71,20 @@ public class ProgramErrorTest {
 
     @Test
     public void testConstructorGood() {
-        new ProgramError(1, ErrorLevel.HIGH, "moo", new Exception(), null, new Date());
+        new ProgramError(1, ErrorLevel.HIGH, "moo", new UnsupportedOperationException(), null, new Date());
     }
 
     @Test
     public void testGetLevel() {
         final ProgramError pe = new ProgramError(1, ErrorLevel.HIGH, "moo",
-                new Exception(), null, new Date());
+                new UnsupportedOperationException(), null, new Date());
         assertEquals(ErrorLevel.HIGH, pe.getLevel());
     }
 
     @Test
     public void testGetMessage() {
         final ProgramError pe = new ProgramError(1, ErrorLevel.HIGH, "moo",
-                new Exception(), null, new Date());
+                new UnsupportedOperationException(), null, new Date());
         assertEquals("moo", pe.getMessage());
     }
 
@@ -92,14 +92,14 @@ public class ProgramErrorTest {
     public void testGetDate() {
         final Date date = new Date();
         final ProgramError pe = new ProgramError(1, ErrorLevel.HIGH, "moo",
-                new Exception(), null, date);
+                new UnsupportedOperationException(), null, date);
         assertEquals(date, pe.getDate());
     }
 
     @Test
     public void testReportStatus() {
         final ProgramError pe = new ProgramError(1, ErrorLevel.HIGH, "moo",
-                new Exception(), null, new Date());
+                new UnsupportedOperationException(), null, new Date());
         assertEquals(ErrorReportStatus.WAITING, pe.getReportStatus());
         pe.setReportStatus(null);
         assertEquals(ErrorReportStatus.WAITING, pe.getReportStatus());
@@ -112,13 +112,13 @@ public class ProgramErrorTest {
     @Test
     public void testToString() {
         final ProgramError pe = new ProgramError(1, ErrorLevel.HIGH, "moo",
-                new Exception(), null, new Date());
-        assertTrue(pe.toString().indexOf("moo") > -1);
+                new UnsupportedOperationException(), null, new Date());
+        assertTrue(pe.toString().contains("moo"));
     }
 
     @Test
     public void testEquals() {
-        final Exception ex = new Exception();
+        final Exception ex = new UnsupportedOperationException();
         final ProgramError pe1 = new ProgramError(10, ErrorLevel.LOW, "moo",
                 ex, null, new Date());
         final ProgramError pe2 = new ProgramError(11, ErrorLevel.LOW, "moo",
@@ -130,7 +130,7 @@ public class ProgramErrorTest {
         final ProgramError pe5 = new ProgramError(10, ErrorLevel.LOW, "moo",
                 null, "Hello", new Date());
 
-        assertFalse(pe1.equals(null));
+        assertFalse(pe1.equals(null)); // NOPMD
         assertFalse(pe1.equals("moo"));
 
         assertTrue(pe1.equals(pe2));

test/com/dmdirc/ui/StatusMessageTest.java

@@ -34,28 +34,28 @@ public class StatusMessageTest {
     @Test
     public void testGetMessageShortConstructor() {
         final AggregateConfigProvider config = mock(AggregateConfigProvider.class);
-        StatusMessage instance = new StatusMessage("test", config);
+        final StatusMessage instance = new StatusMessage("test", config);
         assertEquals("test", instance.getMessage());
     }
 
     @Test
     public void testGetMessageLongConstructor() {
         final AggregateConfigProvider config = mock(AggregateConfigProvider.class);
-        StatusMessage instance = new StatusMessage("icon", "test", null, 10, config);
+        final StatusMessage instance = new StatusMessage("icon", "test", null, 10, config);
         assertEquals("test", instance.getMessage());
     }
 
     @Test
     public void testGetIconType() {
         final AggregateConfigProvider config = mock(AggregateConfigProvider.class);
-        StatusMessage instance = new StatusMessage("icon", "test", null, 10, config);
+        final StatusMessage instance = new StatusMessage("icon", "test", null, 10, config);
         assertEquals("icon", instance.getIconType());
     }
 
     @Test
     public void testGetMessageNotifierNull() {
         final AggregateConfigProvider config = mock(AggregateConfigProvider.class);
-        StatusMessage instance = new StatusMessage("icon", "test", null, 10, config);
+        final StatusMessage instance = new StatusMessage("icon", "test", null, 10, config);
         assertNull(instance.getMessageNotifier());
     }
 
@@ -63,14 +63,14 @@ public class StatusMessageTest {
     public void testGetMessageNotifierNotNull() {
         final AggregateConfigProvider config = mock(AggregateConfigProvider.class);
         final StatusMessageNotifier smn = mock(StatusMessageNotifier.class);
-        StatusMessage instance = new StatusMessage("icon", "test", smn, 10, config);
+        final StatusMessage instance = new StatusMessage("icon", "test", smn, 10, config);
         assertEquals(smn, instance.getMessageNotifier());
     }
 
     @Test
     public void testGetTimeout() {
         final AggregateConfigProvider config = mock(AggregateConfigProvider.class);
-        StatusMessage instance = new StatusMessage("icon", "test", null, 10, config);
+        final StatusMessage instance = new StatusMessage("icon", "test", null, 10, config);
         assertEquals(10, instance.getTimeout());
     }
 
@@ -80,7 +80,7 @@ public class StatusMessageTest {
 
         when(config.getOptionInt("statusBar", "messageDisplayLength")).thenReturn(10);
 
-        StatusMessage instance = new StatusMessage("icon", "test", null, -1, config);
+        final StatusMessage instance = new StatusMessage("icon", "test", null, -1, config);
         assertEquals(10, instance.getTimeout());
     }
 }

test/com/dmdirc/ui/WindowManagerTest.java

@@ -135,10 +135,8 @@ public class WindowManagerTest {
 
     @Test
     public void testAddListenerAndSync() {
-        when(container.getChildren()).thenReturn(Arrays.asList(
-                new FrameContainer[]{child, }));
-        when(child.getChildren()).thenReturn(Arrays.asList(
-                new FrameContainer[]{grandchild, }));
+        when(container.getChildren()).thenReturn(Arrays.asList(child));
+        when(child.getChildren()).thenReturn(Arrays.asList(grandchild));
 
         manager.addWindow(container);
         manager.addListenerAndSync(frameListener);
@@ -159,8 +157,7 @@ public class WindowManagerTest {
 
     @Test
     public void testRemoveWindowRootWindowWithChildren() {
-        when(container.getChildren()).thenReturn(Arrays.asList(
-                new FrameContainer[]{child, }));
+        when(container.getChildren()).thenReturn(Arrays.asList(child));
         when(child.getParent()).thenReturn(Optional.of(container));
 
         manager.addListener(frameListener);
@@ -173,8 +170,7 @@ public class WindowManagerTest {
 
     @Test
     public void testRemoveChildWindowNoChildren() {
-        when(container.getChildren()).thenReturn(Arrays.asList(
-                new FrameContainer[]{child, }));
+        when(container.getChildren()).thenReturn(Arrays.asList(child));
         when(child.getParent()).thenReturn(Optional.of(container));
 
         manager.addListener(frameListener);
@@ -187,10 +183,8 @@ public class WindowManagerTest {
 
     @Test
     public void testRemoveChildWindowWithChildren() {
-        when(container.getChildren()).thenReturn(Arrays.asList(
-                new FrameContainer[]{child, }));
-        when(child.getChildren()).thenReturn(Arrays.asList(
-                new FrameContainer[]{grandchild, }));
+        when(container.getChildren()).thenReturn(Arrays.asList(child));
+        when(child.getChildren()).thenReturn(Arrays.asList(grandchild));
         when(child.getParent()).thenReturn(Optional.of(container));
 
         manager.addListener(frameListener);
@@ -207,7 +201,7 @@ public class WindowManagerTest {
         final FrameContainer root1 = mock(FrameContainer.class);
         final FrameContainer root2 = mock(FrameContainer.class);
         final Collection<FrameContainer> rootWindows
-                = Arrays.asList(new FrameContainer[]{root1, root2, });
+                = Arrays.asList(root1, root2);
 
         manager.addWindow(root1);
         manager.addWindow(root2);

test/com/dmdirc/ui/core/aliases/CoreAliasDialogModelTest.java

@@ -94,7 +94,7 @@ public class CoreAliasDialogModelTest {
         final CoreAliasDialogModel model = new CoreAliasDialogModel(aliasModel, aliasFactory,
                 commandController);
         model.loadModel();
-        assertEquals(model.getAliases().size(), 2);
+        assertEquals(2, model.getAliases().size());
     }
 
     @Test
@@ -125,9 +125,9 @@ public class CoreAliasDialogModelTest {
         final CoreAliasDialogModel model = new CoreAliasDialogModel(aliasModel, aliasFactory,
                 commandController);
         model.loadModel();
-        assertEquals(model.getAliases().size(), 0);
+        assertEquals(0, model.getAliases().size());
         model.addAlias(alias1.getName(), alias1.getMinArguments(), alias1.getSubstitution());
-        assertEquals(model.getAliases().size(), 1);
+        assertEquals(1, model.getAliases().size());
     }
 
     @Test
@@ -148,11 +148,11 @@ public class CoreAliasDialogModelTest {
         final CoreAliasDialogModel model = new CoreAliasDialogModel(aliasModel, aliasFactory,
                 commandController);
         model.loadModel();
-        assertEquals(model.getAliases().size(), 1);
-        assertEquals(model.getAlias(alias2Edited.getName()).get().getMinArguments(), 0);
+        assertEquals(1, model.getAliases().size());
+        assertEquals(0, model.getAlias(alias2Edited.getName()).get().getMinArguments());
         model.editAlias(alias1.getName(), alias2Edited.getMinArguments(), alias2Edited.
                 getSubstitution());
-        assertEquals(model.getAlias(alias1.getName()).get().getMinArguments(), 1);
+        assertEquals(1, model.getAlias(alias1.getName()).get().getMinArguments());
     }
 
     @Test
@@ -175,7 +175,7 @@ public class CoreAliasDialogModelTest {
         final CoreAliasDialogModel model = new CoreAliasDialogModel(aliasModel, aliasFactory,
                 commandController);
         model.loadModel();
-        assertEquals(model.getAliases().size(), 1);
+        assertEquals(1, model.getAliases().size());
         assertEquals(model.getAlias(alias1.getName()).get(), alias1);
         model.renameAlias(alias1.getName(), alias1Edited.getName());
         assertEquals(model.getAlias(alias1Edited.getName()).get(), alias2);
@@ -189,7 +189,7 @@ public class CoreAliasDialogModelTest {
                 commandController);
         model.loadModel();
         model.addListener(listener);
-        assertEquals(model.getAliases().size(), 1);
+        assertEquals(1, model.getAliases().size());
         assertEquals(model.getAlias(alias1.getName()).get(), alias1);
         model.renameAlias(alias1.getName(), alias1Edited.getName());
         verify(listener).aliasRenamed(alias1, alias1Edited);
@@ -203,9 +203,9 @@ public class CoreAliasDialogModelTest {
         final CoreAliasDialogModel model = new CoreAliasDialogModel(aliasModel, aliasFactory,
                 commandController);
         model.loadModel();
-        assertEquals(model.getAliases().size(), 2);
+        assertEquals(2, model.getAliases().size());
         model.removeAlias(alias1.getName());
-        assertEquals(model.getAliases().size(), 1);
+        assertEquals(1, model.getAliases().size());
         assertFalse(model.getAlias(alias1.getName()).isPresent());
     }
 
@@ -230,7 +230,7 @@ public class CoreAliasDialogModelTest {
         final CoreAliasDialogModel model = new CoreAliasDialogModel(aliasModel, aliasFactory,
                 commandController);
         model.loadModel();
-        assertEquals(model.getAliases().size(), 2);
+        assertEquals(2, model.getAliases().size());
         assertTrue(model.getSelectedAlias().isPresent());
     }
 
@@ -242,7 +242,7 @@ public class CoreAliasDialogModelTest {
         final CoreAliasDialogModel model = new CoreAliasDialogModel(aliasModel, aliasFactory,
                 commandController);
         model.loadModel();
-        assertEquals(model.getAliases().size(), 2);
+        assertEquals(2, model.getAliases().size());
         assertTrue(model.getSelectedAlias().isPresent());
         model.setSelectedAlias(Optional.fromNullable(alias2));
         assertEquals(model.getSelectedAlias().get(), alias2);
@@ -256,7 +256,7 @@ public class CoreAliasDialogModelTest {
         final CoreAliasDialogModel model = new CoreAliasDialogModel(aliasModel, aliasFactory,
                 commandController);
         model.loadModel();
-        assertEquals(model.getAliases().size(), 2);
+        assertEquals(2, model.getAliases().size());
         assertTrue(model.getSelectedAlias().isPresent());
         model.setSelectedAlias(Optional.fromNullable(alias2));
         assertEquals(model.getSelectedAlias().get(), alias2);
@@ -285,7 +285,7 @@ public class CoreAliasDialogModelTest {
         final CoreAliasDialogModel model = new CoreAliasDialogModel(aliasModel, aliasFactory,
                 commandController);
         model.loadModel();
-        assertEquals(model.getAliases().size(), 1);
+        assertEquals(1, model.getAliases().size());
         assertEquals(model.getAlias(alias1.getName()).get(), alias1);
         model.setSelectedAlias(Optional.fromNullable(alias1));
         model.setSelectedAliasName(alias1Edited.getName());
@@ -302,7 +302,7 @@ public class CoreAliasDialogModelTest {
         final CoreAliasDialogModel model = new CoreAliasDialogModel(aliasModel, aliasFactory,
                 commandController);
         model.loadModel();
-        assertEquals(model.getAliases().size(), 1);
+        assertEquals(1, model.getAliases().size());
         assertEquals(model.getAlias(alias1.getName()).get(), alias1);
         model.setSelectedAlias(Optional.fromNullable(alias1));
         model.setSelectedAliasMinimumArguments(alias2Edited.getMinArguments());

test/com/dmdirc/ui/core/components/StatusBarManagerTest.java

@@ -44,7 +44,7 @@ public class StatusBarManagerTest {
     @Test
     public void testRegisterStatusBar() {
         final StatusBar sb = mock(StatusBar.class);
-        StatusBarManager instance = new StatusBarManager(eventBus);
+        final StatusBarManager instance = new StatusBarManager(eventBus);
         instance.registerStatusBar(sb);
         instance.clearMessage();
         verify(sb).clearMessage();
@@ -53,7 +53,7 @@ public class StatusBarManagerTest {
     @Test
     public void testUnregisterStatusBar() {
         final StatusBar sb = mock(StatusBar.class);
-        StatusBarManager instance = new StatusBarManager(eventBus);
+        final StatusBarManager instance = new StatusBarManager(eventBus);
         instance.registerStatusBar(sb);
         instance.unregisterStatusBar(sb);
         instance.clearMessage();
@@ -64,7 +64,7 @@ public class StatusBarManagerTest {
     public void testSetMessage() {
         final StatusMessage message = mock(StatusMessage.class);
         final StatusBar sb = mock(StatusBar.class);
-        StatusBarManager instance = new StatusBarManager(eventBus);
+        final StatusBarManager instance = new StatusBarManager(eventBus);
         instance.registerStatusBar(sb);
         instance.setMessage(message);
         verify(sb).setMessage(message);
@@ -73,7 +73,7 @@ public class StatusBarManagerTest {
     @Test
     public void testClearMessage() {
         final StatusBar sb = mock(StatusBar.class);
-        StatusBarManager instance = new StatusBarManager(eventBus);
+        final StatusBarManager instance = new StatusBarManager(eventBus);
         instance.registerStatusBar(sb);
         instance.clearMessage();
         verify(sb).clearMessage();
@@ -83,7 +83,7 @@ public class StatusBarManagerTest {
     public void testAddComponent() {
         final StatusBarComponent comp = mock(StatusBarComponent.class);
         final StatusBar sb = mock(StatusBar.class);
-        StatusBarManager instance = new StatusBarManager(eventBus);
+        final StatusBarManager instance = new StatusBarManager(eventBus);
         instance.registerStatusBar(sb);
         instance.addComponent(comp);
         verify(sb).addComponent(comp);
@@ -93,7 +93,7 @@ public class StatusBarManagerTest {
     public void testRemoveComponent() {
         final StatusBarComponent comp = mock(StatusBarComponent.class);
         final StatusBar sb = mock(StatusBar.class);
-        StatusBarManager instance = new StatusBarManager(eventBus);
+        final StatusBarManager instance = new StatusBarManager(eventBus);
         instance.registerStatusBar(sb);
         instance.removeComponent(comp);
         verify(sb).removeComponent(comp);

test/com/dmdirc/ui/core/feedback/CoreFeedbackDialogModelTest.java

@@ -43,9 +43,9 @@ public class CoreFeedbackDialogModelTest {
     @Mock private ConnectionManager connectionManager;
     @Mock private FeedbackSenderFactory feedbackSenderFactory;
     @Mock private FeedbackDialogModelListener listener;
-    private final String name = "Bob Dole";
-    private final String email = "bob@dole.com";
-    private final String feedback = "DMDirc Rocks.";
+    private static final String NAME = "Bob Dole";
+    private static final String EMAIL = "bob@dole.com";
+    private static final String FEEDBACK = "DMDirc Rocks.";
 
     @Test
     public void testName() {
@@ -53,8 +53,8 @@ public class CoreFeedbackDialogModelTest {
                 connectionManager,
                 feedbackSenderFactory, "configDirectory");
         assertEquals("testName", Optional.absent(), instance.getName());
-        instance.setName(Optional.fromNullable(name));
-        assertEquals("testName", Optional.fromNullable(name), instance.getName());
+        instance.setName(Optional.fromNullable(NAME));
+        assertEquals("testName", Optional.fromNullable(NAME), instance.getName());
     }
 
     @Test
@@ -63,8 +63,8 @@ public class CoreFeedbackDialogModelTest {
                 connectionManager,
                 feedbackSenderFactory, "configDirectory");
         assertEquals("testEmail", Optional.absent(), instance.getEmail());
-        instance.setEmail(Optional.fromNullable(email));
-        assertEquals("testEmail", Optional.fromNullable(email), instance.getEmail());
+        instance.setEmail(Optional.fromNullable(EMAIL));
+        assertEquals("testEmail", Optional.fromNullable(EMAIL), instance.getEmail());
     }
 
     @Test
@@ -73,8 +73,8 @@ public class CoreFeedbackDialogModelTest {
                 connectionManager,
                 feedbackSenderFactory, "configDirectory");
         assertEquals("testFeedback", Optional.absent(), instance.getFeedback());
-        instance.setFeedback(Optional.fromNullable(feedback));
-        assertEquals("testFeedback", Optional.fromNullable(feedback), instance.getFeedback());
+        instance.setFeedback(Optional.fromNullable(FEEDBACK));
+        assertEquals("testFeedback", Optional.fromNullable(FEEDBACK), instance.getFeedback());
     }
 
     @Test

test/com/dmdirc/ui/core/newserver/CoreNewServerDialogModelTest.java

@@ -71,7 +71,7 @@ public class CoreNewServerDialogModelTest {
 
     @Test
     public void testGetProfiles() {
-        CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
+        final CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
                 controller, connectionManager);
         instance.loadModel();
         assertEquals("loadModel: ", Lists.newArrayList(profile1, profile2), instance.
@@ -80,7 +80,7 @@ public class CoreNewServerDialogModelTest {
 
     @Test
     public void testSelectedProfile() {
-        CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
+        final CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
                 controller, connectionManager);
         instance.loadModel();
         assertEquals("testSelectedProfile: ", Optional.absent(), instance.getSelectedProfile());
@@ -93,7 +93,7 @@ public class CoreNewServerDialogModelTest {
     public void testProfileValidatorEmpty() {
         when(controller.getProvidersByType("profile")).thenReturn(
                 Lists.<ConfigProvider>newArrayList());
-        CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
+        final CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
                 controller, connectionManager);
         instance.loadModel();
         assertFalse("testProfileValidatorEmpty: ", instance.isProfileListValid());
@@ -103,7 +103,7 @@ public class CoreNewServerDialogModelTest {
     public void testProfileValidatorNotEmpty() {
         when(controller.getProvidersByType("profile")).thenReturn(
                 Lists.newArrayList(profile1, profile2));
-        CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
+        final CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
                 controller, connectionManager);
         instance.loadModel();
         assertTrue("testProfileValidatorNotEmpty: ", instance.isProfileListValid());
@@ -111,7 +111,7 @@ public class CoreNewServerDialogModelTest {
 
     @Test
     public void testHostname() {
-        CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
+        final CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
                 controller, connectionManager);
         instance.loadModel();
         assertEquals("testHostname: ", Optional.fromNullable("hostname"), instance.getHostname());
@@ -122,7 +122,7 @@ public class CoreNewServerDialogModelTest {
     @Test
     public void testHostnameValidatorValid() {
         when(globalConfig.getOption("newserver", "hostname")).thenReturn("hostname");
-        CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
+        final CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
                 controller, connectionManager);
         instance.loadModel();
         assertTrue("testHostnameValidatorValid: ", instance.isHostnameValid());
@@ -131,7 +131,7 @@ public class CoreNewServerDialogModelTest {
     @Test
     public void testHostnameValidatorInvalid() {
         when(globalConfig.getOption("newserver", "hostname")).thenReturn("~!£$^£$%^&");
-        CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
+        final CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
                 controller, connectionManager);
         instance.loadModel();
         assertFalse("testHostnameValidatorInvalid: ", instance.isHostnameValid());
@@ -139,7 +139,7 @@ public class CoreNewServerDialogModelTest {
 
     @Test
     public void testPort() {
-        CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
+        final CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
                 controller, connectionManager);
         instance.loadModel();
         assertEquals("testPort: ", Optional.fromNullable(1111), instance.getPort());
@@ -150,7 +150,7 @@ public class CoreNewServerDialogModelTest {
     @Test
     public void testPortValidatorValid() {
         when(globalConfig.getOptionInt("newserver", "port")).thenReturn(1111);
-        CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
+        final CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
                 controller, connectionManager);
         instance.loadModel();
         assertTrue("testPortValidatorValid: ", instance.isPortValid());
@@ -159,7 +159,7 @@ public class CoreNewServerDialogModelTest {
     @Test
     public void testPortValidatorTooLow() {
         when(globalConfig.getOptionInt("newserver", "port")).thenReturn(-1);
-        CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
+        final CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
                 controller, connectionManager);
         instance.loadModel();
         assertFalse("testPortValidatorTooLow: ", instance.isPortValid());
@@ -168,7 +168,7 @@ public class CoreNewServerDialogModelTest {
     @Test
     public void testPortValidatorTooHigh() {
         when(globalConfig.getOptionInt("newserver", "port")).thenReturn(65536);
-        CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
+        final CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
                 controller, connectionManager);
         instance.loadModel();
         assertFalse("testPortValidatorTooHigh: ", instance.isPortValid());
@@ -176,7 +176,7 @@ public class CoreNewServerDialogModelTest {
 
     @Test
     public void testPassword() {
-        CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
+        final CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
                 controller, connectionManager);
         instance.loadModel();
         assertEquals("testPassword: ", Optional.fromNullable("password"), instance.getPassword());
@@ -187,7 +187,7 @@ public class CoreNewServerDialogModelTest {
     @Test
     public void testPasswordValidatorValid() {
         when(globalConfig.getOption("newserver", "password")).thenReturn("password");
-        CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
+        final CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
                 controller, connectionManager);
         instance.loadModel();
         assertTrue("testPasswordValidatorValid: ", instance.isPortValid());
@@ -195,7 +195,7 @@ public class CoreNewServerDialogModelTest {
 
     @Test
     public void testSSL() {
-        CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
+        final CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
                 controller, connectionManager);
         instance.loadModel();
         assertTrue("testSSL: ", instance.getSSL());
@@ -205,7 +205,7 @@ public class CoreNewServerDialogModelTest {
 
     @Test
     public void testSaveAsDefault() {
-        CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
+        final CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
                 controller, connectionManager);
         instance.loadModel();
         assertFalse("testSaveAsDefault:", instance.getSaveAsDefault());
@@ -216,7 +216,7 @@ public class CoreNewServerDialogModelTest {
     @Test
     public void testIsSaveAllowedValid() {
         when(globalConfig.getOption("newserver", "hostname")).thenReturn("hostname");
-        CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
+        final CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
                 controller, connectionManager);
         instance.loadModel();
         assertTrue("testIsSaveAllowedValid: ", instance.isSaveAllowed());
@@ -225,7 +225,7 @@ public class CoreNewServerDialogModelTest {
     @Test
     public void testIsSaveAllowedInvalidHostname() {
         when(globalConfig.getOption("newserver", "hostname")).thenReturn("~!£$^£$%^&");
-        CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
+        final CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
                 controller, connectionManager);
         instance.loadModel();
         assertFalse("testIsSaveAllowedInvalidHostname: ", instance.isSaveAllowed());
@@ -234,7 +234,7 @@ public class CoreNewServerDialogModelTest {
     @Test
     public void testIsSaveAllowedInvalidPort() {
         when(globalConfig.getOption("newserver", "hostname")).thenReturn("-1");
-        CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
+        final CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
                 controller, connectionManager);
         instance.loadModel();
         assertFalse("testIsSaveAllowedInvalidPort: ", instance.isSaveAllowed());
@@ -242,7 +242,7 @@ public class CoreNewServerDialogModelTest {
 
     @Test
     public void testSaveSaveDefaults() {
-        CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
+        final CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
                 controller, connectionManager);
         instance.loadModel();
         instance.setSaveAsDefault(true);
@@ -255,7 +255,7 @@ public class CoreNewServerDialogModelTest {
 
     @Test
     public void testSaveNotDefaults() {
-        CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
+        final CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
                 controller, connectionManager);
         instance.loadModel();
         instance.setSaveAsDefault(false);
@@ -268,7 +268,7 @@ public class CoreNewServerDialogModelTest {
 
     @Test
     public void testSaveConnectWithoutProfile() throws URISyntaxException {
-        CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
+        final CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
                 controller, connectionManager);
         instance.loadModel();
         instance.save();
@@ -278,7 +278,7 @@ public class CoreNewServerDialogModelTest {
 
     @Test
     public void testSaveConnectWithProfile() throws URISyntaxException {
-        CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
+        final CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
                 controller, connectionManager);
         instance.loadModel();
         instance.setSelectedProfile(Optional.fromNullable(profile1));
@@ -290,7 +290,7 @@ public class CoreNewServerDialogModelTest {
     @Test
     public void testAddConfigProvider() {
         when(controller.getProvidersByType("profile")).thenReturn(Lists.newArrayList(profile1));
-        CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
+        final CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
                 controller, connectionManager);
         instance.loadModel();
         assertEquals("testAddConfigProvider:", Lists.newArrayList(profile1),
@@ -304,7 +304,7 @@ public class CoreNewServerDialogModelTest {
     public void testRemoveConfigProvider() {
         when(controller.getProvidersByType("profile")).thenReturn(
                 Lists.newArrayList(profile1, profile2));
-        CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
+        final CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
                 controller, connectionManager);
         instance.loadModel();
         assertEquals("testRemoveConfigProvider:", Lists.newArrayList(profile1, profile2),
@@ -318,7 +318,7 @@ public class CoreNewServerDialogModelTest {
     public void testRemoveConfigProviderSelectedProfile() {
         when(controller.getProvidersByType("profile")).thenReturn(
                 Lists.newArrayList(profile1, profile2));
-        CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
+        final CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
                 controller, connectionManager);
         instance.loadModel();
         instance.setSelectedProfile(Optional.fromNullable(profile2));
@@ -336,7 +336,7 @@ public class CoreNewServerDialogModelTest {
 
     @Test
     public void testListenerSelectedProfileChanged() {
-        CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
+        final CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
                 controller, connectionManager);
         instance.loadModel();
         assertEquals("testListenerSelectedProfileChanged: ", Optional.<ConfigProvider>absent(),
@@ -351,7 +351,7 @@ public class CoreNewServerDialogModelTest {
 
     @Test
     public void testListenerProfileListChangedRemoved() {
-        CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
+        final CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
                 controller, connectionManager);
         instance.loadModel();
         instance.addListener(listener);
@@ -367,7 +367,7 @@ public class CoreNewServerDialogModelTest {
     public void testListenerProfileListChangedAdded() {
         when(controller.getProvidersByType("profile"))
                 .thenReturn(Lists.newArrayList(profile1));
-        CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
+        final CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
                 controller, connectionManager);
         instance.loadModel();
         instance.addListener(listener);
@@ -381,7 +381,7 @@ public class CoreNewServerDialogModelTest {
 
     @Test
     public void testListenerServerDetailsChangedPort() {
-        CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
+        final CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
                 controller, connectionManager);
         instance.loadModel();
         instance.addListener(listener);
@@ -392,7 +392,7 @@ public class CoreNewServerDialogModelTest {
 
     @Test
     public void testListenerServerDetailsChangedPassword() {
-        CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
+        final CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
                 controller, connectionManager);
         instance.loadModel();
         instance.addListener(listener);
@@ -403,7 +403,7 @@ public class CoreNewServerDialogModelTest {
 
     @Test
     public void testListenerServerDetailsChangedSSL() {
-        CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
+        final CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
                 controller, connectionManager);
         instance.loadModel();
         instance.addListener(listener);
@@ -414,7 +414,7 @@ public class CoreNewServerDialogModelTest {
 
     @Test
     public void testListenerServerDetailsChangedSaveAsDefault() {
-        CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
+        final CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
                 controller, connectionManager);
         instance.loadModel();
         instance.addListener(listener);
@@ -425,7 +425,7 @@ public class CoreNewServerDialogModelTest {
 
     @Test
     public void testRemoveListener() {
-        CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
+        final CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
                 controller, connectionManager);
         instance.loadModel();
         instance.addListener(listener);
@@ -440,7 +440,7 @@ public class CoreNewServerDialogModelTest {
 
     @Test
     public void testSaveDefaults() throws URISyntaxException {
-        CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
+        final CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
                 controller, connectionManager);
         instance.loadModel();
         instance.setSelectedProfile(Optional.fromNullable(profile1));
@@ -454,7 +454,7 @@ public class CoreNewServerDialogModelTest {
 
     @Test
     public void testNoSaveDefaults() throws URISyntaxException {
-        CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
+        final CoreNewServerDialogModel instance = new CoreNewServerDialogModel(globalConfig, userConfig,
                 controller, connectionManager);
         instance.loadModel();
         instance.setSelectedProfile(Optional.fromNullable(profile1));

test/com/dmdirc/ui/core/util/URLHandlerTest.java

@@ -50,7 +50,7 @@ public class URLHandlerTest {
             final String result = URLHandler.substituteParams((URI) test[0],
                     (String) test[1]);
             assertEquals(test[0].toString() + " + " + test[1].toString() + " ==> " + result,
-                    (String) test[2], result);
+                    test[2], result);
         }
     }
 }

test/com/dmdirc/ui/messages/ColourManagerTest.java

@@ -61,73 +61,73 @@ public class ColourManagerTest {
 
     @Test
     public void testGetColourInt() {
-        int spec = 4;
+        final int spec = 4;
 
-        Colour expResult = Colour.RED;
-        Colour result = manager.getColourFromIrcCode(spec);
+        final Colour expResult = Colour.RED;
+        final Colour result = manager.getColourFromIrcCode(spec);
         assertEquals(expResult, result);
     }
 
     @Test
     public void testGetColourOOB() {
-        Colour result = manager.getColourFromIrcCode(20);
+        final Colour result = manager.getColourFromIrcCode(20);
         assertEquals(Colour.WHITE, result);
     }
 
     @Test
     public void testGetColourHexInvalid() {
-        String spec = "FFZZFF";
+        final String spec = "FFZZFF";
 
-        Colour result = manager.getColourFromHex(spec);
+        final Colour result = manager.getColourFromHex(spec);
         assertEquals(Colour.WHITE, result);
     }
 
     @Test
     public void testGetColourHex() {
-        String spec = "FFFFFF";
+        final String spec = "FFFFFF";
 
-        Colour expResult = Colour.WHITE;
-        Colour result = manager.getColourFromHex(spec);
+        final Colour expResult = Colour.WHITE;
+        final Colour result = manager.getColourFromHex(spec);
         assertEquals(expResult, result);
     }
 
     @Test
     public void testParseColourNull() {
-        Colour fallback = Colour.RED;
-        Colour result = manager.getColourFromString(null, fallback);
+        final Colour fallback = Colour.RED;
+        final Colour result = manager.getColourFromString(null, fallback);
 
         assertEquals(fallback, result);
     }
 
     @Test
     public void testParseColourInvalidNumber() {
-        Colour fallback = Colour.RED;
-        Colour result = manager.getColourFromString("zz", fallback);
+        final Colour fallback = Colour.RED;
+        final Colour result = manager.getColourFromString("zz", fallback);
 
         assertEquals(fallback, result);
     }
 
     @Test
     public void testParseColourOOBNumber() {
-        Colour fallback = Colour.RED;
-        Colour result = manager.getColourFromString("20", fallback);
+        final Colour fallback = Colour.RED;
+        final Colour result = manager.getColourFromString("20", fallback);
 
         assertEquals(fallback, result);
     }
 
     @Test
     public void testParseColourShortNumber() {
-        Colour fallback = Colour.RED;
-        Colour result = manager.getColourFromString("1234", fallback);
+        final Colour fallback = Colour.RED;
+        final Colour result = manager.getColourFromString("1234", fallback);
 
         assertEquals(fallback, result);
     }
 
     @Test
     public void testColourCache() {
-        Colour result1 = manager.getColourFromString("ff0f0f", Colour.WHITE);
-        Colour result2 = manager.getColourFromString("ff0f0f", Colour.WHITE);
-        Colour result3 = manager.getColourFromHex("ff0f0f");
+        final Colour result1 = manager.getColourFromString("ff0f0f", Colour.WHITE);
+        final Colour result2 = manager.getColourFromString("ff0f0f", Colour.WHITE);
+        final Colour result3 = manager.getColourFromHex("ff0f0f");
 
         assertSame(result1, result2);
         assertSame(result2, result3);

test/com/dmdirc/ui/messages/FormatterTest.java

@@ -56,12 +56,12 @@ public class FormatterTest {
     public void testBasicFormats() {
         assertEquals("Hello!", Formatter.formatMessage(configProvider, "1%1$s", "Hello!"));
         assertEquals("Hello!", Formatter.formatMessage(configProvider, "1%1$s", "Hello!", "Moo!", "Bar!"));
-        assertTrue(Formatter.formatMessage(configProvider, "0%1$s", "Hello!")
-                .toLowerCase().indexOf("no format string") > -1);
-        assertTrue(Formatter.formatMessage(configProvider, "1%5$s", "Hello!")
-                .toLowerCase().indexOf("invalid format string") > -1);
-        assertTrue(Formatter.formatMessage(configProvider, "1%1$Z", "Hello!")
-                .toLowerCase().indexOf("invalid format string") > -1);
+        assertTrue(Formatter.formatMessage(configProvider, "0%1$s", "Hello!").toLowerCase()
+                .contains("no format string"));
+        assertTrue(Formatter.formatMessage(configProvider, "1%5$s", "Hello!").toLowerCase()
+                .contains("invalid format string"));
+        assertTrue(Formatter.formatMessage(configProvider, "1%1$Z", "Hello!").toLowerCase()
+                .contains("invalid format string"));
     }
 
     @Test

test/com/dmdirc/ui/messages/IntelligentLinkingTest.java

@@ -41,7 +41,7 @@ public class IntelligentLinkingTest {
     private final String input, expected;
     private final Styliser styliser;
 
-    public IntelligentLinkingTest(String input, String expected) {
+    public IntelligentLinkingTest(final String input, final String expected) {
         this.input = input;
         this.expected = expected;
 

test/com/dmdirc/ui/messages/StyliserIndicesTest.java

@@ -37,7 +37,7 @@ public class StyliserIndicesTest {
     protected String input, output;
     protected int start, end;
 
-    public StyliserIndicesTest(String input, int start, int end, String output) {
+    public StyliserIndicesTest(final String input, final int start, final int end, final String output) {
         this.input = input;
         this.start = start;
         this.end = end;

test/com/dmdirc/ui/messages/StyliserStylesTest.java

@@ -49,7 +49,7 @@ public class StyliserStylesTest {
 
     protected String input, output;
 
-    public StyliserStylesTest(String input, String output) {
+    public StyliserStylesTest(final String input, final String output) {
         this.input = input;
         this.output = output;
     }
@@ -92,7 +92,7 @@ public class StyliserStylesTest {
             final StringBuilder builder) {
         builder.append('<');
 
-        String[] entries = new String[9];
+        final String[] entries = new String[9];
 
         for (Map.Entry<AttributedCharacterIterator.Attribute, Object> entry : map.entrySet()) {
 
@@ -136,7 +136,7 @@ public class StyliserStylesTest {
     protected static String toColour(final Object object) {
         final Color colour = (Color) object;
 
-        return colour.getRed() + "," + colour.getGreen() + ","
+        return colour.getRed() + "," + colour.getGreen() + ','
                 + colour.getBlue();
     }
 

test/com/dmdirc/ui/messages/StyliserTest.java

@@ -37,43 +37,43 @@ public class StyliserTest {
 
     @Test
     public void testStripControlCodes1() {
-        String input = "This"+((char) 2)+" is "+((char) 17)+"a test";
+        final String input = "This"+((char) 2)+" is "+((char) 17)+"a test";
 
-        String expResult = "This is a test";
-        String result = Styliser.stipControlCodes(input);
+        final String expResult = "This is a test";
+        final String result = Styliser.stipControlCodes(input);
         assertEquals(expResult, result);
     }
 
     @Test
     public void testStripControlCodes2() {
-        String input = "This is "+((char) 3)+"5a "+((char) 4)+"FF0000test";
+        final String input = "This is "+((char) 3)+"5a "+((char) 4)+"FF0000test";
 
-        String expResult = "This is a test";
-        String result = Styliser.stipControlCodes(input);
+        final String expResult = "This is a test";
+        final String result = Styliser.stipControlCodes(input);
         assertEquals(expResult, result);
     }
 
     @Test
     public void testReadUntilControl1() {
-        String input = "This"+((char) 2)+" is "+((char) 17)+"a test";
-        String expResult = "This";
-        String result = Styliser.readUntilControl(input);
+        final String input = "This"+((char) 2)+" is "+((char) 17)+"a test";
+        final String expResult = "This";
+        final String result = Styliser.readUntilControl(input);
         assertEquals(expResult, result);
     }
 
     @Test
     public void testReadUntilControl2() {
-        String input = "This"+((char) 17)+" is "+((char) 17)+"a test";
-        String expResult = "This";
-        String result = Styliser.readUntilControl(input);
+        final String input = "This"+((char) 17)+" is "+((char) 17)+"a test";
+        final String expResult = "This";
+        final String result = Styliser.readUntilControl(input);
         assertEquals(expResult, result);
     }
 
     @Test
     public void testReadUntilControl3() {
-        String input = ((char) 31)+" is "+((char) 17)+"a test";
-        String expResult = "";
-        String result = Styliser.readUntilControl(input);
+        final String input = ((char) 31)+" is "+((char) 17)+"a test";
+        final String expResult = "";
+        final String result = Styliser.readUntilControl(input);
         assertEquals(expResult, result);
     }
 

test/com/dmdirc/updater/installing/LegacyInstallationStrategyTest.java

@@ -31,7 +31,6 @@ import java.io.IOException;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
 public class LegacyInstallationStrategyTest {
@@ -53,7 +52,7 @@ public class LegacyInstallationStrategyTest {
     }
 
     @Test
-    public void testCallsInstallWithCorrectPath() throws Exception {
+    public void testCallsInstallWithCorrectPath() throws Exception { // NOPMD
         final File file = mock(File.class);
         when(file.getAbsolutePath()).thenReturn("/my/path");
         when(result.getFile()).thenReturn(file);
@@ -62,7 +61,7 @@ public class LegacyInstallationStrategyTest {
     }
 
     @Test
-    public void testRaisesCompletedEvent() throws Exception {
+    public void testRaisesCompletedEvent() throws Exception { // NOPMD
         final File file = mock(File.class);
         when(result.getFile()).thenReturn(file);
         strategy.addUpdateInstallationListener(listener);
@@ -71,7 +70,7 @@ public class LegacyInstallationStrategyTest {
     }
 
     @Test
-    public void testRaisesFailedEvent() throws Exception {
+    public void testRaisesFailedEvent() throws Exception { // NOPMD
         final File file = mock(File.class);
         when(result.getFile()).thenReturn(file);
         when(component.doInstall(anyString())).thenThrow(new IOException());

test/com/dmdirc/util/URIParserTextParameterizedTest.java

@@ -36,7 +36,7 @@ public class URIParserTextParameterizedTest {
 
     private final String input, expected;
 
-    public URIParserTextParameterizedTest(String input, String expected) {
+    public URIParserTextParameterizedTest(final String input, final String expected) {
         this.input = input;
         this.expected = expected;
     }

test/com/dmdirc/util/URIParserURIParameterizedTest.java

@@ -36,7 +36,7 @@ public class URIParserURIParameterizedTest {
 
     private final String input, expected;
 
-    public URIParserURIParameterizedTest(String input, String expected) {
+    public URIParserURIParameterizedTest(final String input, final String expected) {
         this.input = input;
         this.expected = expected;
     }

test/com/dmdirc/util/URLBuilderTest.java

@@ -66,158 +66,158 @@ public class URLBuilderTest {
 
     @Test
     public void testGetUrlForFileWithoutFilePrefix() throws MalformedURLException {
-        URLBuilder urlBuilder
+        final URLBuilder urlBuilder
                 = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertEquals(new URL("file://test"), urlBuilder.getUrlForFile("test"));
     }
 
     @Test
     public void testGetUrlForFileWithFilePrefix() throws MalformedURLException {
-        URLBuilder urlBuilder
+        final URLBuilder urlBuilder
                 = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertEquals(new URL("file://test"), urlBuilder.getUrlForFile("file://test"));
     }
 
     @Test
     public void testGetUrlInvalid() throws MalformedURLException {
-        URLBuilder urlBuilder
+        final URLBuilder urlBuilder
                 = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertNull(urlBuilder.getUrlForFile("file://[test"));
     }
 
     @Test
     public void testGetUrlForJarFile() throws MalformedURLException {
-        URLBuilder urlBuilder
+        final URLBuilder urlBuilder
                 = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertEquals(new URL("jar:file:/jarFile!/test"), urlBuilder.getUrlForJarFile("jarFile", "test"));
     }
 
     @Test
     public void testGetUrlForJarFileInvalud() throws MalformedURLException {
-        URLBuilder urlBuilder
+        final URLBuilder urlBuilder
                 = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertNull(urlBuilder.getUrlForJarFile("[jarFile", "test"));
     }
 
     @Test
     public void testGetUrlForDMDircResourceNonExistant() {
-        URLBuilder urlBuilder
+        final URLBuilder urlBuilder
                 = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertNull(urlBuilder.getUrlForDMDircResource("test12345678"));
     }
 
     @Test
     public void testGetUrlForDMDircResource() throws MalformedURLException {
-        URLBuilder urlBuilder
+        final URLBuilder urlBuilder
                 = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
-        URL url = urlBuilder.getUrlForDMDircResource("com/dmdirc/Main.class");
+        final URL url = urlBuilder.getUrlForDMDircResource("com/dmdirc/Main.class");
         Assert.assertEquals("file", url.getProtocol());
         Assert.assertTrue(url.getFile().endsWith("com/dmdirc/Main.class"));
     }
 
     @Test
     public void testGetUrlForThemeResource() throws MalformedURLException {
-        URLBuilder urlBuilder
+        final URLBuilder urlBuilder
                 = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertEquals(new URL("jar:file:/themes/testTheme.zip!/testFile"), urlBuilder.getUrlForThemeResource("testTheme", "testFile"));
     }
 
     @Test
     public void testGetUrlForPluginResource() throws MalformedURLException {
-        URLBuilder urlBuilder
+        final URLBuilder urlBuilder
                 = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertEquals(new URL("jar:file:/testPlugin!/testFile"), urlBuilder.getUrlForPluginResource("testPlugin", "testFile"));
     }
 
     @Test
     public void testGetUrlDMDirc() {
-        URLBuilder urlBuilder
+        final URLBuilder urlBuilder
                 = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
-        URL url = urlBuilder.getUrl("dmdirc://com/dmdirc/Main.class");
+        final URL url = urlBuilder.getUrl("dmdirc://com/dmdirc/Main.class");
         Assert.assertEquals("file", url.getProtocol());
         Assert.assertTrue(url.getFile().endsWith("com/dmdirc/Main.class"));
     }
 
     @Test
     public void testGetUrlJar() throws MalformedURLException {
-        URLBuilder urlBuilder
+        final URLBuilder urlBuilder
                 = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertEquals(new URL("jar:file:/jarFile!/testFile"), urlBuilder.getUrl("jar://jarFile:testFile"));
     }
 
     @Test
     public void testGetUrlJarWithoutFile() throws MalformedURLException {
-        URLBuilder urlBuilder
+        final URLBuilder urlBuilder
                 = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertNull(urlBuilder.getUrl("jar://jarFile"));
     }
 
     @Test
     public void testGetUrlZip() throws MalformedURLException {
-        URLBuilder urlBuilder
+        final URLBuilder urlBuilder
                 = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertEquals(new URL("jar:file:/zipFile!/testFile"), urlBuilder.getUrl("zip://zipFile:testFile"));
     }
 
     @Test
     public void testGetUrlZipWithoutFile() throws MalformedURLException {
-        URLBuilder urlBuilder
+        final URLBuilder urlBuilder
                 = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertNull(urlBuilder.getUrl("zip://zipFile"));
     }
 
     @Test
     public void testGetUrlPlugin() throws MalformedURLException {
-        URLBuilder urlBuilder
+        final URLBuilder urlBuilder
                 = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertEquals(new URL("jar:file:/testPlugin!/testFile"), urlBuilder.getUrl("plugin://pluginFile:testFile"));
     }
 
     @Test
     public void testGetUrlPluginWithoutFile() throws MalformedURLException {
-        URLBuilder urlBuilder
+        final URLBuilder urlBuilder
                 = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertNull(urlBuilder.getUrl("plugin://pluginFile"));
     }
 
     @Test
     public void testGetUrlTheme() throws MalformedURLException {
-        URLBuilder urlBuilder
+        final URLBuilder urlBuilder
                 = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertEquals(new URL("jar:file:/themes/themeFile.zip!/testFile"), urlBuilder.getUrl("theme://themeFile:testFile"));
     }
 
     @Test
     public void testGetUrlThemeWithoutFile() throws MalformedURLException {
-        URLBuilder urlBuilder
+        final URLBuilder urlBuilder
                 = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertNull(urlBuilder.getUrl("theme://themeFile"));
     }
 
     @Test
     public void testGetUrlHTTP() throws MalformedURLException {
-        URLBuilder urlBuilder
+        final URLBuilder urlBuilder
                 = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertEquals(new URL("http://testDomain"), urlBuilder.getUrl("http://testDomain"));
     }
 
     @Test
     public void testGetUrlHTTPInvalid() throws MalformedURLException {
-        URLBuilder urlBuilder
+        final URLBuilder urlBuilder
                 = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertNull(urlBuilder.getUrl("http://[testDomain"));
     }
 
     @Test
     public void testGetUrlFileWithPrefix() throws MalformedURLException {
-        URLBuilder urlBuilder
+        final URLBuilder urlBuilder
                 = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertEquals(new URL("file://testFile"), urlBuilder.getUrl("file://testFile"));
     }
 
     @Test
     public void testGetUrlFileWithoutPrefix() throws MalformedURLException {
-        URLBuilder urlBuilder
+        final URLBuilder urlBuilder
                 = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertEquals(new URL("file://testFile"), urlBuilder.getUrl("testFile"));
     }