Minor tidying.

Disable some new 'controversial' PMD rules, and enable some of the
others we had suppressed.

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

etc/pmd/minimal.xml

@@ -5,10 +5,8 @@
 	 xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
 	 xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
 	<description>DMDirc minimal PMD checks.</description>
-	
-	<rule ref="rulesets/basic.xml">
-		<exclude name="EmptyCatchBlock"/> <!-- ! -->
-	</rule>
+
+	<rule ref="rulesets/basic.xml"/>
 	<rule ref="rulesets/braces.xml"/>
 	<rule ref="rulesets/clone.xml"/>
 	<rule ref="rulesets/controversial.xml">
@@ -19,9 +17,10 @@
 		<exclude name="AvoidFinalLocalVariable"/>
 		<exclude name="AssignmentInOperand"/>
 		<exclude name="CallSuperInConstructor"/>
-		<exclude name="DefaultPackage"/> <!-- ! -->
 		<exclude name="AvoidUsingVolatile"/>
 		<exclude name="BooleanInversion"/>
+		<exclude name="AtLeastOneConstructor"/>
+                <exclude name="AvoidLiteralsInIfCondition"/>
 		<exclude name="AvoidUsingNativeCode"/>
 		<exclude name="AvoidUsingShortType"/>
 	</rule>
@@ -32,10 +31,10 @@
 		<exclude name="SwitchStmtsShouldHaveDefault"/>
 		<exclude name="UseLocaleWithCaseConversions"/>
 		<exclude name="AvoidSynchronizedAtMethodLevel"/> <!-- ! -->
-		<exclude name="ImmutableField"/> <!-- ! -->
 		<exclude name="SimpleDateFormatNeedsLocale"/>
 		<exclude name="EmptyMethodInAbstractClassShouldBeAbstract"/>
 		<exclude name="PositionLiteralsFirstInComparisons"/>
+		<exclude name="UncommentedEmptyMethod"/>
 	</rule>
 	<rule ref="rulesets/finalizers.xml"/>
 	<rule ref="rulesets/imports.xml"/>
@@ -58,8 +57,6 @@
 	<rule ref="rulesets/optimizations.xml">
                 <exclude name="AvoidInstantiatingObjectsInLoops"/>
 		<exclude name="UseStringBufferForStringAppends"/>
-		<exclude name="LocalVariableCouldBeFinal"/> <!-- ! -->
-		<exclude name="MethodArgumentCouldBeFinal"/> <!-- ! -->
 		<exclude name="AddEmptyString"/>
         </rule>
 	<rule ref="rulesets/strings.xml">

src/com/dmdirc/logger/ProgramError.java

@@ -65,7 +65,7 @@ public final class ProgramError implements Serializable {
     /** Date/time error last occurred. */
     private Date lastDate;
     /** Number of occurrences. */
-    private AtomicInteger count;
+    private final AtomicInteger count;
     /** Error report Status. */
     private ErrorReportStatus reportStatus;
 
@@ -136,8 +136,8 @@ public final class ProgramError implements Serializable {
      * @return Error trace
      */
     public String[] getTrace() {
-        return exception != null ? getTrace(exception) : message != null ? new String[]{message}
-                : new String[0];
+        return exception == null ? (message == null ? new String[0] : new String[]{message})
+                : getTrace(exception);
     }
 
     /**

src/com/dmdirc/ui/CoreUIUtils.java

@@ -32,7 +32,7 @@ import java.awt.Window;
 /**
  * Core UI Utilities.
  */
-public class CoreUIUtils {
+public final class CoreUIUtils {
 
     /** Precent creation. */
     private CoreUIUtils() {

src/com/dmdirc/ui/core/util/Utils.java

@@ -43,7 +43,7 @@ import javax.swing.text.StyledDocument;
 /**
  * Core UI Utilities.
  */
-public class Utils {
+public final class Utils {
 
     /** Prevent instantiation. */
     private Utils() {

src/com/dmdirc/util/YamlReaderUtils.java

@@ -33,7 +33,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 /**
  * Provides utility methods for classes that read from YAML files.
  */
-public class YamlReaderUtils {
+public final class YamlReaderUtils {
 
     private YamlReaderUtils() {
         // Shouldn't be instansiated

src/com/dmdirc/util/resourcemanager/DMDircResourceManager.java

@@ -38,7 +38,7 @@ import java.security.CodeSource;
 /**
  * Provides utility methods for working with resources from the DMDirc distribution.
  */
-public class DMDircResourceManager {
+public final class DMDircResourceManager {
 
     private DMDircResourceManager() {
         //Prevent instantiation