Enable PMD for plugins.

Fix assorted PMD errors.

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

build.gradle

@@ -4,6 +4,7 @@ import org.mdonoughe.JGitDescribeTask
 
 subprojects {
     apply plugin: 'java'
+    apply plugin: 'pmd'
 
     configurations {
         bundle
@@ -73,6 +74,11 @@ subprojects {
         targetFile << "\n\nversion:\n  number=${version}\n"
     }
 
+    pmd {
+        ruleSets = []
+        ruleSetFiles = files("$rootDir/etc/pmd/full.xml")
+    }
+
     jar {
         from("$buildDir/plugin.config") {
             into 'META-INF'

calc/test/com/dmdirc/addons/calc/EvaluatorTest.java

@@ -37,7 +37,7 @@ public class EvaluatorTest {
     private final String input;
     private final float output;
 
-    public EvaluatorTest(String input, String output) {
+    public EvaluatorTest(final String input, final String output) {
         this.input = input;
         this.output = Float.parseFloat(output);
     }

conditional_execute/test/com/dmdirc/addons/conditional_execute/ConditionalExecuteCommandTest.java

@@ -154,11 +154,11 @@ public class ConditionalExecuteCommandTest {
         verifyNoCommandExecuted();
     }
 
-    private void execute(String line) {
+    private void execute(final String line) {
         command.execute(container, new CommandArguments(commandController, line), context);
     }
 
-    private void verifyCommandExecuted(String command) {
+    private void verifyCommandExecuted(final String command) {
         verify(commandParser).parseCommand(same(container), eq(command));
     }
 
@@ -166,7 +166,7 @@ public class ConditionalExecuteCommandTest {
         verify(commandParser, never()).parseCommand(same(container), anyString());
     }
 
-    private void verifyErrorOutput(String substring) {
+    private void verifyErrorOutput(final String substring) {
         verify(container).addLine(eq("commandError"), contains(substring));
     }
 

dcc/src/com/dmdirc/addons/dcc/DCCManager.java

@@ -464,10 +464,10 @@ public class DCCManager {
                     bit = bit.substring(1);
                 }
                 if (bit.endsWith("\"")) {
-                    filenameBits.append(" ").append(bit.substring(0, bit.length() - 1));
+                    filenameBits.append(' ').append(bit.substring(0, bit.length() - 1));
                     break;
                 } else {
-                    filenameBits.append(" ").append(bit);
+                    filenameBits.append(' ').append(bit);
                 }
             }
             tmpFilename = filenameBits.toString().trim();
@@ -514,13 +514,12 @@ public class DCCManager {
             return;
         }
 
-        if (DCCTransfer.findByToken(token) == null && !dontAsk) {
-            if (token.isEmpty() || port.equals("0")) {
-                // Make sure this is not a reverse DCC Send that we no longer care about.
-                eventBus.publish(new DccSendRequestEvent(connection, nickname, filename));
-                new SendRequestDialog(mainWindow, this, token, ipLong, portInt, filename, size,
-                        nickname, connection).display();
-            }
+        if (DCCTransfer.findByToken(token) == null && !dontAsk &&
+                (token.isEmpty() || port.equals("0"))) {
+            // Make sure this is not a reverse DCC Send that we no longer care about.
+            eventBus.publish(new DccSendRequestEvent(connection, nickname, filename));
+            new SendRequestDialog(mainWindow, this, token, ipLong, portInt, filename, size,
+                    nickname, connection).display();
         }
     }
 
@@ -561,11 +560,11 @@ public class DCCManager {
                     bit = bit.substring(1);
                 }
                 if (bit.endsWith("\"")) {
-                    filenameBits.append(" ")
+                    filenameBits.append(' ')
                             .append(bit.substring(0, bit.length() - 1));
                     break;
                 } else {
-                    filenameBits.append(" ").append(bit);
+                    filenameBits.append(' ').append(bit);
                 }
             }
             filename = filenameBits.toString().trim();

dcc/src/com/dmdirc/addons/dcc/TransferContainer.java

@@ -161,7 +161,7 @@ public class TransferContainer extends FrameContainer implements
         if (percentageInTitle) {
             final StringBuilder title = new StringBuilder();
             if (dcc.isListenSocket()) {
-                title.append("*");
+                title.append('*');
             }
             title.append(dcc.getType() == DCCTransfer.TransferType.SEND
                     ? "Sending: " : "Receiving: ");

dcc/src/com/dmdirc/addons/dcc/ui/TransferPanel.java

@@ -260,7 +260,7 @@ public class TransferPanel extends JPanel implements ActionListener,
 
         if (hours > 0) {
             result.append(hours);
-            result.append(":");
+            result.append(':');
         }
         result.append(String.format("%0,2d:%0,2d", minutes, seconds));
 

debug/test/com/dmdirc/addons/debug/DebugTest.java

@@ -51,7 +51,6 @@ public class DebugTest {
 
     @Mock private CommandArguments arguments;
     @Mock private FrameContainer container;
-    @Mock private DebugPlugin plugin;
     @Mock private CommandController controller;
     @Mock private DebugCommand debugCommand;
     @Mock private CommandContext commandContext;

etc/pmd/full.xml

@@ -0,0 +1,142 @@
+<?xml version="1.0"?>
+<ruleset name="DMDirc PMD checks"
+         xmlns="http://pmd.sf.net/ruleset/1.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         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/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/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/java/unusedcode.xml/UnusedModifier"><priority>1</priority></rule>
+<rule ref="rulesets/java/controversial.xml/DontImportSun"><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/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/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/java/logging-java.xml/MoreThanOneLogger"><priority>1</priority></rule>
+<rule ref="rulesets/java/logging-java.xml/LoggerIsNotStaticFinal"><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/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/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/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/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/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/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>

lagdisplay/src/com/dmdirc/addons/lagdisplay/LagDisplayManager.java

@@ -254,7 +254,7 @@ public class LagDisplayManager implements ConfigChangeListener, SelectionListene
     }
 
     @Handler
-    public void HandleServerPingSent(final ServerPingsentEvent event) {
+    public void handleServerPingSent(final ServerPingsentEvent event) {
         if (!event.getConnection().getWindowModel().getConfigManager().
                 getOptionBool(domain, "usealternate")) {
             return;

logging/src/com/dmdirc/addons/logging/LoggingManager.java

@@ -97,6 +97,8 @@ public class LoggingManager implements ConfigChangeListener {
     /** Date format used for "File Opened At" log. */
     private static final DateFormat OPENED_AT_FORMAT = new SimpleDateFormat(
             "EEEE MMMM dd, yyyy - HH:mm:ss");
+    /** Object for synchronising access to the date forma.t */
+    private static final Object FORMAT_LOCK = new Object();
     /** This plugin's plugin info. */
     private final String domain;
     /** Global config. */
@@ -220,9 +222,11 @@ public class LoggingManager implements ConfigChangeListener {
             showBackBuffer(event.getQuery(), filename);
         }
 
-        appendLine(filename, "*** Query opened at: %s", OPENED_AT_FORMAT.format(new Date()));
-        appendLine(filename, "*** Query with User: %s", event.getQuery().getHost());
-        appendLine(filename, "");
+        synchronized (FORMAT_LOCK) {
+            appendLine(filename, "*** Query opened at: %s", OPENED_AT_FORMAT.format(new Date()));
+            appendLine(filename, "*** Query with User: %s", event.getQuery().getHost());
+            appendLine(filename, "");
+        }
     }
 
     @Handler
@@ -230,7 +234,11 @@ public class LoggingManager implements ConfigChangeListener {
         final Parser parser = event.getQuery().getConnection().getParser();
         final ClientInfo client = parser.getClient(event.getQuery().getHost());
         final String filename = getLogFile(client);
-        appendLine(filename, "*** Query closed at: %s", OPENED_AT_FORMAT.format(new Date()));
+
+        synchronized (FORMAT_LOCK) {
+            appendLine(filename, "*** Query closed at: %s", OPENED_AT_FORMAT.format(new Date()));
+        }
+
         if (openFiles.containsKey(filename)) {
             StreamUtils.close(openFiles.get(filename).writer);
             openFiles.remove(filename);
@@ -370,15 +378,20 @@ public class LoggingManager implements ConfigChangeListener {
             showBackBuffer(event.getChannel(), filename);
         }
 
-        appendLine(filename, "*** Channel opened at: %s", OPENED_AT_FORMAT.format(new Date()));
-        appendLine(filename, "");
+        synchronized (FORMAT_LOCK) {
+            appendLine(filename, "*** Channel opened at: %s", OPENED_AT_FORMAT.format(new Date()));
+            appendLine(filename, "");
+        }
     }
 
     @Handler
     public void handleChannelClosed(final ChannelClosedEvent event) {
         final String filename = getLogFile(event.getChannel().getName());
 
-        appendLine(filename, "*** Channel closed at: %s", OPENED_AT_FORMAT.format(new Date()));
+        synchronized (FORMAT_LOCK) {
+            appendLine(filename, "*** Channel closed at: %s", OPENED_AT_FORMAT.format(new Date()));
+        }
+
         if (openFiles.containsKey(filename)) {
             StreamUtils.close(openFiles.get(filename).writer);
             openFiles.remove(filename);

mediasource_dbus/src/com/dmdirc/addons/mediasource_dbus/MPRISSource.java

@@ -208,14 +208,14 @@ public class MPRISSource implements MediaSource {
                 result.append('0');
             }
 
-            result.append(hours).append(":");
+            result.append(hours).append(':');
         }
 
         if (minutes < 10) {
             result.append('0');
         }
 
-        result.append(minutes).append(":");
+        result.append(minutes).append(':');
 
         if (seconds < 10) {
             result.append('0');

mediasource_dcop/src/com/dmdirc/addons/mediasource_dcop/KaffeineSource.java

@@ -119,14 +119,14 @@ public class KaffeineSource implements MediaSource {
                 result.append('0');
             }
 
-            result.append(hours).append(":");
+            result.append(hours).append(':');
         }
 
         if (minutes < 10) {
             result.append('0');
         }
 
-        result.append(minutes).append(":");
+        result.append(minutes).append(':');
 
         if (seconds < 10) {
             result.append('0');

mediasource_dcop/src/com/dmdirc/addons/mediasource_dcop/NoatunSource.java

@@ -132,11 +132,11 @@ public class NoatunSource implements MediaSource {
         final long seconds = secondsInput % 60;
 
         if (hours > 0) {
-            result.append(hours).append(":");
+            result.append(hours).append(':');
         }
 
-        result.append(minutes).append(":");
-        result.append(seconds).append(":");
+        result.append(minutes).append(':');
+        result.append(seconds).append(':');
 
         return result.toString();
     }

mediasource_windows/src/com/dmdirc/addons/mediasource_windows/DllSource.java

@@ -136,7 +136,7 @@ public class DllSource implements MediaSource {
         final long seconds = (secondsInput % 60);
 
         if (hours > 0) {
-            result.append(hours).append(":");
+            result.append(hours).append(':');
         }
         result.append(String.format("%0,2d:%0,2d", minutes, seconds));
 

ui_swing/src/com/dmdirc/addons/ui_swing/UIUtilities.java

@@ -206,7 +206,7 @@ public final class UIUtilities {
             } catch (InterruptedException ex) {
                 //Ignore
             } catch (InvocationTargetException ex) {
-                throw new RuntimeException(ex);
+                throw new RuntimeException(ex); // NOPMD
             }
         }
     }
@@ -229,7 +229,7 @@ public final class UIUtilities {
                 return task.get();
             }
         } catch (Exception ex) {
-            throw new RuntimeException(ex);
+            throw new RuntimeException(ex); // NOPMD
         }
     }
 

ui_swing/src/com/dmdirc/addons/ui_swing/components/NickList.java

@@ -164,7 +164,7 @@ public class NickList extends JScrollPane implements ConfigChangeListener,
 
             for (ChannelClientInfo value : values) {
                 if (builder.length() > 0) {
-                    builder.append("\n");
+                    builder.append('\n');
                 }
 
                 builder.append(value.getClient().getNickname());

ui_swing/src/com/dmdirc/addons/ui_swing/components/SwingSearchBar.java

@@ -68,8 +68,6 @@ public final class SwingSearchBar extends JPanel implements ActionListener,
     private final TextFrame parent;
     /** Colour Manager. */
     private final ColourManager colourManager;
-    /** Config to read from. */
-    private final AggregateConfigProvider config;
     /** Close button. */
     private ImageButton<Object> closeButton;
     /** Next match button. */
@@ -101,7 +99,6 @@ public final class SwingSearchBar extends JPanel implements ActionListener,
         listeners = new ListenerList();
 
         this.parent = newParent;
-        this.config = parent.getContainer().getConfigManager();
         this.colourManager = colourManager;
 
         getInputMap(JComponent.WHEN_FOCUSED).
@@ -247,25 +244,23 @@ public final class SwingSearchBar extends JPanel implements ActionListener,
         final LinePosition result = up ? searcher.searchUp() : searcher.
                 searchDown();
 
-        if (result == null) {
-            //Do nothing
-        } else if ((textPane.getSelectedRange().getEndLine() != 0 || textPane.
-                getSelectedRange().getEndPos() != 0)
-                && ((up && result.getEndLine() > textPane.getSelectedRange().
-                getEndLine())
-                || (!up && result.getStartLine() < textPane.getSelectedRange().
-                getStartLine()))) {
-            wrapIndicator.setVisible(true);
-            textPane.setScrollBarPosition(result.getEndLine());
-            textPane.setSelectedText(result);
-            validator.setValidates(true);
-            searchBox.checkError();
-        } else {
-            //found, select and return found
-            textPane.setScrollBarPosition(result.getEndLine());
-            textPane.setSelectedText(result);
-            validator.setValidates(true);
-            searchBox.checkError();
+        if (result != null) {
+            if ((textPane.getSelectedRange().getEndLine() != 0 || textPane.
+                    getSelectedRange().getEndPos() != 0)
+                    && (up && result.getEndLine() > textPane.getSelectedRange().getEndLine()
+                    || !up && result.getStartLine() < textPane.getSelectedRange().getStartLine())) {
+                wrapIndicator.setVisible(true);
+                textPane.setScrollBarPosition(result.getEndLine());
+                textPane.setSelectedText(result);
+                validator.setValidates(true);
+                searchBox.checkError();
+            } else {
+                //found, select and return found
+                textPane.setScrollBarPosition(result.getEndLine());
+                textPane.setSelectedText(result);
+                validator.setValidates(true);
+                searchBox.checkError();
+            }
         }
     }
 

ui_swing/src/com/dmdirc/addons/ui_swing/components/menubar/MenuBar.java

@@ -52,7 +52,7 @@ public class MenuBar extends JMenuBar {
     /** Normal menu count. */
     private final int menuItemCount;
     /** Stores a list of tokens used to remove added menu items. */
-    private final Map<String, JMenuItem> menuItems;
+    private final Map<String, JMenuItem> menuItems; // NOPMD
 
     /**
      * Instantiates a new menu bar.

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionConditionDisplayPanel.java

@@ -234,7 +234,7 @@ public class ActionConditionDisplayPanel extends JPanel implements
             }
 
             sb.append(condition.getComponent().getName());
-            sb.append(" ");
+            sb.append(' ');
 
             if (condition.getComparison() == null) {
                 sb.append(" ...");
@@ -250,7 +250,7 @@ public class ActionConditionDisplayPanel extends JPanel implements
             }
 
             sb.append(condition.getTarget().replace("<", "&lt;"));
-            sb.append("'");
+            sb.append('\'');
             return sb.toString();
         }
     }

ui_swing/test/com/dmdirc/addons/ui_swing/dialogs/profiles/AddNicknameValidatorTest.java

@@ -41,7 +41,7 @@ public class AddNicknameValidatorTest {
         final ProfileManagerModel model = mock(ProfileManagerModel.class);
         when(model.getNicknames()).thenReturn(Arrays.asList(
                 new String[]{"nickname1", "nickname2",}));
-        AddNicknameValidator instance = new AddNicknameValidator(model);
+        final AddNicknameValidator instance = new AddNicknameValidator(model);
         assertTrue(instance.validate("nickname1").isFailure());
     }
 
@@ -53,7 +53,7 @@ public class AddNicknameValidatorTest {
         final ProfileManagerModel model = mock(ProfileManagerModel.class);
         when(model.getNicknames()).thenReturn(Arrays.asList(
                 new String[]{"nickname1", "nickname2",}));
-        AddNicknameValidator instance = new AddNicknameValidator(model);
+        final AddNicknameValidator instance = new AddNicknameValidator(model);
         assertFalse(instance.validate("nickname").isFailure());
     }
 }

ui_swing/test/com/dmdirc/addons/ui_swing/dialogs/profiles/EditNicknameValidatorTest.java

@@ -42,7 +42,7 @@ public class EditNicknameValidatorTest {
         when(model.getSelectedNickname()).thenReturn(null);
         when(model.getNicknames()).thenReturn(Arrays.asList(
                 new String[]{"nickname1", "nickname2",}));
-        EditNicknameValidator instance = new EditNicknameValidator(model);
+        final EditNicknameValidator instance = new EditNicknameValidator(model);
         assertFalse(instance.validate("nickname").isFailure());
     }
 
@@ -55,7 +55,7 @@ public class EditNicknameValidatorTest {
         when(model.getSelectedNickname()).thenReturn("nickname");
         when(model.getNicknames()).thenReturn(Arrays.asList(
                 new String[]{"nickname1", "nickname2",}));
-        EditNicknameValidator instance = new EditNicknameValidator(model);
+        final EditNicknameValidator instance = new EditNicknameValidator(model);
         assertFalse(instance.validate("nickname").isFailure());
     }
 
@@ -68,7 +68,7 @@ public class EditNicknameValidatorTest {
         when(model.getSelectedNickname()).thenReturn("nickname");
         when(model.getNicknames()).thenReturn(Arrays.asList(
                 new String[]{"nickname1", "nickname2",}));
-        EditNicknameValidator instance = new EditNicknameValidator(model);
+        final EditNicknameValidator instance = new EditNicknameValidator(model);
         assertFalse(instance.validate("nickname3").isFailure());
     }
 }

ui_swing/test/com/dmdirc/addons/ui_swing/dialogs/profiles/ProfileManagerModelTest.java

@@ -70,8 +70,7 @@ public class ProfileManagerModelTest {
         when(configProvider.getOption("profile", "realname")).thenReturn(prefix + "realname");
         when(configProvider.getOption("profile", "ident")).thenReturn(prefix + "ident");
 
-        final Profile profile = new Profile(identityFactory, configProvider);
-        return profile;
+        return new Profile(identityFactory, configProvider);
     }
 
     private ProfileManagerModel createModel() {
@@ -82,7 +81,7 @@ public class ProfileManagerModelTest {
     }
 
     @Before
-    public void setup() throws Exception {
+    public void setup() {
         final List<ConfigProvider> identities = Collections.emptyList();
         manager = mock(IdentityController.class);
         when(manager.getProvidersByType("profile")).thenReturn(identities);
@@ -106,7 +105,7 @@ public class ProfileManagerModelTest {
         final IdentityController im = mock(IdentityController.class);
         when(im.getProvidersByType("profile")).thenReturn(identities);
 
-        ProfileManagerModel instance = new ProfileManagerModel(im, identityFactory);
+        final ProfileManagerModel instance = new ProfileManagerModel(im, identityFactory);
         instance.load();
 
         assertEquals(Arrays.asList(new Profile[]{new Profile(identityFactory, configProvider), }), instance.getProfiles());
@@ -119,7 +118,7 @@ public class ProfileManagerModelTest {
     public void testGetAndSetProfiles() {
         final List<Profile> newProfiles = Arrays.asList(
                 new Profile[]{createProfile("2"),});
-        ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
+        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
         assertEquals(Collections.emptyList(), instance.getProfiles());
         instance.setProfiles(newProfiles);
         assertEquals(newProfiles, instance.getProfiles());
@@ -131,7 +130,7 @@ public class ProfileManagerModelTest {
     @Test
     public void testAddProfiles() {
         final Profile newProfile = createProfile("2");
-        ProfileManagerModel instance = createModel();
+        final ProfileManagerModel instance = createModel();
         assertEquals(Arrays.asList(new Profile[]{defaultProfile,}), instance.getProfiles());
         final List<Profile> newProfiles = new ArrayList<>();
         newProfiles.add(defaultProfile);
@@ -146,7 +145,7 @@ public class ProfileManagerModelTest {
     @Test
     public void testDeleteProfileNullProfile() {
         final Profile first = createProfile("1");
-        ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
+        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
         instance.addProfile(first);
         instance.setSelectedProfile(first);
         assertEquals(first, instance.getSelectedProfile());
@@ -161,7 +160,7 @@ public class ProfileManagerModelTest {
     public void testDeleteProfileNotSelected() {
         final Profile first = createProfile("1");
         final Profile second = createProfile("2");
-        ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
+        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
         instance.addProfile(first);
         instance.addProfile(second);
         instance.setSelectedProfile(second);
@@ -177,7 +176,7 @@ public class ProfileManagerModelTest {
     public void testDeleteProfileLastProfile() {
         final Profile first = createProfile("1");
         final Profile second = createProfile("2");
-        ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
+        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
         instance.addProfile(first);
         instance.addProfile(second);
         instance.setSelectedProfile(second);
@@ -193,7 +192,7 @@ public class ProfileManagerModelTest {
     public void testDeleteProfileFirstProfile() {
         final Profile first = createProfile("1");
         final Profile second = createProfile("2");
-        ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
+        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
         instance.addProfile(first);
         instance.addProfile(second);
         instance.setSelectedProfile(first);
@@ -210,7 +209,7 @@ public class ProfileManagerModelTest {
         final Profile first = createProfile("1");
         final Profile second = createProfile("2");
         final Profile third = createProfile("3");
-        ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
+        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
         instance.addProfile(first);
         instance.addProfile(second);
         instance.addProfile(third);
@@ -226,7 +225,7 @@ public class ProfileManagerModelTest {
     @Test
     public void testDeleteProfileOnlyProfile() {
         final Profile first = createProfile("1");
-        ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
+        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
         instance.addProfile(first);
         instance.setSelectedProfile(first);
         assertEquals(first, instance.getSelectedProfile());
@@ -239,10 +238,10 @@ public class ProfileManagerModelTest {
      */
     @Test
     public void testGetAndSetSelectedProfile() {
-        Profile profile2 = createProfile("2");
-        Profile profile3 = createProfile("3");
-        Profile profile4 = createProfile("4");
-        ProfileManagerModel instance = createModel();
+        final Profile profile2 = createProfile("2");
+        final Profile profile3 = createProfile("3");
+        final Profile profile4 = createProfile("4");
+        final ProfileManagerModel instance = createModel();
         assertEquals(defaultProfile, instance.getSelectedProfile());
         instance.addProfile(profile2);
         assertEquals(profile2, instance.getSelectedProfile());
@@ -258,7 +257,7 @@ public class ProfileManagerModelTest {
      */
     @Test
     public void testGetAndSetNicknames() {
-        ProfileManagerModel instance = createModel();
+        final ProfileManagerModel instance = createModel();
         final List<String> expResult = defaultProfile.getNicknames();
         List<String> result = instance.getNicknames();
         assertEquals(expResult, result);
@@ -272,8 +271,8 @@ public class ProfileManagerModelTest {
      */
     @Test
     public void testAddNickname() {
-        String nickname = "foo";
-        ProfileManagerModel instance = createModel();
+        final String nickname = "foo";
+        final ProfileManagerModel instance = createModel();
         assertEquals(defaultProfile.getNicknames(), instance.getNicknames());
         final List<String> nicknames = new ArrayList<>(defaultProfile.getNicknames());
         instance.addNickname(nickname);
@@ -286,7 +285,7 @@ public class ProfileManagerModelTest {
      */
     @Test
     public void testDeleteNicknameObject() {
-        ProfileManagerModel instance = createModel();
+        final ProfileManagerModel instance = createModel();
         final List<String> nicknames = new ArrayList<>(instance.getNicknames());
         Object nickname = (Object) "";
         assertEquals(nicknames, instance.getNicknames());
@@ -303,7 +302,7 @@ public class ProfileManagerModelTest {
      */
     @Test
     public void testDeleteNicknameNullSelectedProfile() {
-        ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
+        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
         assertNull(instance.getSelectedProfile());
         assertTrue(instance.getNicknames().isEmpty());
         instance.deleteNickname("1nickname");
@@ -316,7 +315,7 @@ public class ProfileManagerModelTest {
     public void testDeleteNicknameNullNickname() {
         final Profile profile = createProfile("1");
         final String first = "1nickname";
-        ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
+        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
         instance.addProfile(profile);
         instance.setSelectedProfile(profile);
         instance.setSelectedNickname(first);
@@ -333,7 +332,7 @@ public class ProfileManagerModelTest {
         final Profile profile = createProfile("1");
         final String first = "1nickname";
         final String second = "1nickname2";
-        ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
+        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
         instance.addProfile(profile);
         instance.setSelectedProfile(profile);
         instance.addNickname(second);
@@ -351,7 +350,7 @@ public class ProfileManagerModelTest {
         final Profile profile = createProfile("1");
         final String first = "1nickname";
         final String second = "1nickname2";
-        ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
+        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
         instance.addProfile(profile);
         instance.setSelectedProfile(profile);
         instance.addNickname(second);
@@ -369,7 +368,7 @@ public class ProfileManagerModelTest {
         final Profile profile = createProfile("1");
         final String first = "1nickname";
         final String second = "1nickname2";
-        ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
+        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
         instance.addProfile(profile);
         instance.setSelectedProfile(profile);
         instance.addNickname(second);
@@ -388,7 +387,7 @@ public class ProfileManagerModelTest {
         final String first = "1nickname";
         final String second = "1nickname2";
         final String third = "1nickname3";
-        ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
+        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
         instance.addProfile(profile);
         instance.setSelectedProfile(profile);
         instance.addNickname(second);
@@ -406,7 +405,7 @@ public class ProfileManagerModelTest {
     public void testDeleteNicknameOnlyNickname() {
         final Profile profile = createProfile("1");
         final String first = "1nickname";
-        ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
+        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
         instance.addProfile(profile);
         instance.setSelectedProfile(profile);
         instance.setSelectedNickname(first);
@@ -421,7 +420,7 @@ public class ProfileManagerModelTest {
     @Test
     public void testGetAndSetSelectedNickname() {
         final String selectedNickname = "1nickname";
-        ProfileManagerModel instance = createModel();
+        final ProfileManagerModel instance = createModel();
         assertNull(instance.getSelectedNickname());
         instance.setSelectedNickname(selectedNickname);
         assertEquals(selectedNickname, instance.getSelectedNickname());
@@ -434,7 +433,7 @@ public class ProfileManagerModelTest {
      */
     @Test
     public void testEditNickname() {
-        ProfileManagerModel instance = createModel();
+        final ProfileManagerModel instance = createModel();
         final List<String> nicknames = new ArrayList<>(instance.getNicknames());
         final String nickname = nicknames.get(0);
         assertEquals(nicknames, instance.getNicknames());
@@ -450,7 +449,7 @@ public class ProfileManagerModelTest {
      */
     @Test
     public void testGetAndSetName() {
-        ProfileManagerModel instance = createModel();
+        final ProfileManagerModel instance = createModel();
         final String name = defaultProfile.getName();
         final String newName = "foo";
         assertEquals(name, instance.getName());
@@ -463,7 +462,7 @@ public class ProfileManagerModelTest {
      */
     @Test
     public void testGetAndSetRealname() {
-        ProfileManagerModel instance = createModel();
+        final ProfileManagerModel instance = createModel();
         final String name = "1realname";
         final String newName = "foo";
         assertEquals(name, instance.getRealname());
@@ -476,7 +475,7 @@ public class ProfileManagerModelTest {
      */
     @Test
     public void testGetAndSetIdent() {
-        ProfileManagerModel instance = createModel();
+        final ProfileManagerModel instance = createModel();
         final String name = "1ident";
         final String newName = "foo";
         assertEquals(name, instance.getIdent());
@@ -489,7 +488,7 @@ public class ProfileManagerModelTest {
      */
     @Test
     public void testIsManipulateProfileAllowed() {
-        ProfileManagerModel instance = createModel();
+        final ProfileManagerModel instance = createModel();
         assertTrue(instance.isManipulateProfileAllowed());
         instance.setProfiles(Arrays.asList(new Profile[]{}));
         assertFalse(instance.isManipulateProfileAllowed());
@@ -500,7 +499,7 @@ public class ProfileManagerModelTest {
      */
     @Test
     public void testIsManipulateNicknameAllowed() {
-        ProfileManagerModel instance = createModel();
+        final ProfileManagerModel instance = createModel();
         assertFalse(instance.isManipulateNicknameAllowed());
         instance.setSelectedNickname("1nickname");
         assertTrue(instance.isManipulateNicknameAllowed());
@@ -512,7 +511,7 @@ public class ProfileManagerModelTest {
         profile.setName("*");
         profile.setRealname("");
         profile.setIdent("*");
-        ProfileManagerModel instance = createModel();
+        final ProfileManagerModel instance = createModel();
         assertTrue(instance.isChangeProfileAllowed());
         instance.setProfiles(Arrays.asList(new Profile[]{profile,}));
         assertFalse(instance.isChangeProfileAllowed());
@@ -535,7 +534,7 @@ public class ProfileManagerModelTest {
         profile.setName("*");
         profile.setRealname("");
         profile.setIdent("*");
-        ProfileManagerModel instance = createModel();
+        final ProfileManagerModel instance = createModel();
         assertTrue(instance.isOKAllowed());
         instance.setProfiles(Arrays.asList(new Profile[]{}));
         assertFalse(instance.isOKAllowed());
@@ -556,7 +555,7 @@ public class ProfileManagerModelTest {
      */
     @Test
     public void testIsNameInValid() {
-        ProfileManagerModel instance = createModel();
+        final ProfileManagerModel instance = createModel();
         instance.setProfiles(Arrays.asList(defaultProfile));
         instance.setName("\\");
         assertTrue(instance.isNameValid().isFailure());
@@ -567,7 +566,7 @@ public class ProfileManagerModelTest {
      */
     @Test
     public void testIsNameValid() {
-        ProfileManagerModel instance = createModel();
+        final ProfileManagerModel instance = createModel();
         instance.setProfiles(Arrays.asList(defaultProfile));
         instance.setName("profile");
         assertFalse(instance.isNameValid().isFailure());
@@ -578,7 +577,7 @@ public class ProfileManagerModelTest {
      */
     @Test
     public void testIsNicknamesInValid() {
-        ProfileManagerModel instance = createModel();
+        final ProfileManagerModel instance = createModel();
         instance.setProfiles(Arrays.asList(defaultProfile));
         instance.setNicknames(Arrays.asList(new String[]{}));
         assertTrue(instance.isNicknamesValid().isFailure());
@@ -589,7 +588,7 @@ public class ProfileManagerModelTest {
      */
     @Test
     public void testIsNicknamesValid() {
-        ProfileManagerModel instance = createModel();
+        final ProfileManagerModel instance = createModel();
         instance.setProfiles(Arrays.asList(defaultProfile));
         instance.setNicknames(Arrays.asList(new String[]{"nickname"}));
         assertFalse(instance.isNicknamesValid().isFailure());
@@ -600,7 +599,7 @@ public class ProfileManagerModelTest {
      */
     @Test
     public void testIsRealnameInValid() {
-        ProfileManagerModel instance = createModel();
+        final ProfileManagerModel instance = createModel();
         instance.setProfiles(Arrays.asList(defaultProfile));
         instance.setRealname("");
         assertTrue(instance.isRealnameValid().isFailure());
@@ -611,7 +610,7 @@ public class ProfileManagerModelTest {
      */
     @Test
     public void testIsRealnameValid() {
-        ProfileManagerModel instance = createModel();
+        final ProfileManagerModel instance = createModel();
         instance.setProfiles(Arrays.asList(defaultProfile));
         instance.setRealname("realname");
         assertFalse(instance.isRealnameValid().isFailure());
@@ -622,7 +621,7 @@ public class ProfileManagerModelTest {
      */
     @Test
     public void testIsIdentInValid() {
-        ProfileManagerModel instance = createModel();
+        final ProfileManagerModel instance = createModel();
         instance.setProfiles(Arrays.asList(defaultProfile));
         instance.setIdent("*");
         assertTrue(instance.isIdentValid().isFailure());
@@ -633,7 +632,7 @@ public class ProfileManagerModelTest {
      */
     @Test
     public void testIsIdentValid() {
-        ProfileManagerModel instance = createModel();
+        final ProfileManagerModel instance = createModel();
         instance.setProfiles(Arrays.asList(defaultProfile));
         instance.setIdent("ident");
         assertFalse(instance.isIdentValid().isFailure());
@@ -644,7 +643,7 @@ public class ProfileManagerModelTest {
      */
     @Test
     public void testIsIdentValidEmptyString() {
-        ProfileManagerModel instance = createModel();
+        final ProfileManagerModel instance = createModel();
         instance.setProfiles(Arrays.asList(defaultProfile));
         instance.setIdent("");
         assertFalse(instance.isIdentValid().isFailure());
@@ -655,7 +654,7 @@ public class ProfileManagerModelTest {
      */
     @Test
     public void testNullSelectedProfileGetters() {
-        ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
+        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
         assertTrue("".equals(instance.getSelectedNickname()));
         assertTrue("".equals(instance.getName()));
         assertTrue("".equals(instance.getRealname()));
@@ -668,7 +667,7 @@ public class ProfileManagerModelTest {
      */
     @Test
     public void testNullSelectedProfileValidators() {
-        ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
+        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
         assertFalse(instance.isNameValid().isFailure());
         assertFalse(instance.isNicknamesValid().isFailure());
         assertFalse(instance.isRealnameValid().isFailure());
@@ -681,7 +680,7 @@ public class ProfileManagerModelTest {
     @Test
     public void testNullSelectedProfileSetSelectedNickname() {
         final String test = "test";
-        ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
+        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
         assertTrue("".equals(instance.getSelectedNickname()));
         instance.setSelectedNickname(test);
         assertTrue("".equals(instance.getSelectedNickname()));
@@ -693,7 +692,7 @@ public class ProfileManagerModelTest {
     @Test
     public void testNullSelectedProfileSetName() {
         final String test = "test";
-        ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
+        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
         assertTrue("".equals(instance.getName()));
         instance.setName(test);
         assertTrue("".equals(instance.getName()));
@@ -705,7 +704,7 @@ public class ProfileManagerModelTest {
     @Test
     public void testNullSelectedProfileSetRealname() {
         final String test = "test";
-        ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
+        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
         assertTrue("".equals(instance.getRealname()));
         instance.setRealname(test);
         assertTrue("".equals(instance.getRealname()));
@@ -717,7 +716,7 @@ public class ProfileManagerModelTest {
     @Test
     public void testNullSelectedProfileSetIdent() {
         final String test = "test";
-        ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
+        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
         assertTrue("".equals(instance.getIdent()));
         instance.setIdent(test);
         assertTrue("".equals(instance.getIdent()));
@@ -729,7 +728,7 @@ public class ProfileManagerModelTest {
     @Test
     public void testNullSelectedProfileSetNicknames() {
         final String test = "test";
-        ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
+        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
         assertTrue(instance.getNicknames().isEmpty());
         instance.setNicknames(Arrays.asList(new String[]{test, }));
         assertTrue(instance.getNicknames().isEmpty());
@@ -741,7 +740,7 @@ public class ProfileManagerModelTest {
     @Test
     public void testNullSelectedProfileAddNickname() {
         final String test = "test";
-        ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
+        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
         assertTrue(instance.getNicknames().isEmpty());
         instance.addNickname(test);
         assertTrue(instance.getNicknames().isEmpty());
@@ -753,7 +752,7 @@ public class ProfileManagerModelTest {
     @Test
     public void testNullSelectedProfileDeleteNickname() {
         final String test = "test";
-        ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
+        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
         assertTrue(instance.getNicknames().isEmpty());
         instance.deleteNickname(test);
         assertTrue(instance.getNicknames().isEmpty());
@@ -770,7 +769,7 @@ public class ProfileManagerModelTest {
         final Profile second = mock(Profile.class);
         when(first.isDeleted()).thenReturn(false);
         when(second.isDeleted()).thenReturn(true);
-        ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
+        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
         instance.setProfiles(Arrays.asList(new Profile[]{first, second, }));
         instance.save();
         verify(first).save();

ui_swing/test/com/dmdirc/addons/ui_swing/dialogs/profiles/ProfileNameValidatorTest.java

@@ -63,7 +63,7 @@ public class ProfileNameValidatorTest {
      */
     @Test
     public void testValidateNoDupes() {
-        ProfileRenameValidator instance = new ProfileRenameValidator(model);
+        final ProfileRenameValidator instance = new ProfileRenameValidator(model);
         assertFalse(instance.validate("Random").isFailure());
     }
 
@@ -72,7 +72,7 @@ public class ProfileNameValidatorTest {
      */
     @Test
     public void testValidateNonSelectedDupe() {
-        ProfileRenameValidator instance = new ProfileRenameValidator(model);
+        final ProfileRenameValidator instance = new ProfileRenameValidator(model);
         assertTrue(instance.validate("other").isFailure());
     }
 
@@ -81,7 +81,7 @@ public class ProfileNameValidatorTest {
      */
     @Test
     public void testValidateSelectedDupe() {
-        ProfileRenameValidator instance = new ProfileRenameValidator(model);
+        final ProfileRenameValidator instance = new ProfileRenameValidator(model);
         assertFalse(instance.validate("selected").isFailure());
     }
 }