PMD fixes

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

src/com/dmdirc/parser/irc/IRCChannelInfo.java

@@ -465,7 +465,7 @@ public class IRCChannelInfo implements ChannelInfo {
             sTemp = paramModes.get(cTemp);
             if (!sTemp.isEmpty()) {
                 sModes.append(cTemp);
-                sModeParams.append(" ").append(this.getMode(cTemp));
+                sModeParams.append(' ').append(this.getMode(cTemp));
             }
         }
 
@@ -683,20 +683,20 @@ public class IRCChannelInfo implements ChannelInfo {
             if (positive) {
                 positivemode.append(modestr.charAt(1));
                 if (modeparam.length > 1) {
-                    positiveparam.append(" ").append(modeparam[1]);
+                    positiveparam.append(' ').append(modeparam[1]);
                 }
             } else {
                 negativemode.append(modestr.charAt(1));
                 if (modeparam.length > 1) {
-                    negativeparam.append(" ").append(modeparam[1]);
+                    negativeparam.append(' ').append(modeparam[1]);
                 }
             }
         }
         if (negativemode.length() > 0) {
-            sendModeStr.append("-").append(negativemode);
+            sendModeStr.append('-').append(negativemode);
         }
         if (positivemode.length() > 0) {
-            sendModeStr.append("+").append(positivemode);
+            sendModeStr.append('+').append(positivemode);
         }
         if (negativeparam.length() > 0) {
             sendModeStr.append(negativeparam);
@@ -705,7 +705,7 @@ public class IRCChannelInfo implements ChannelInfo {
             sendModeStr.append(positiveparam);
         }
         parser.callDebugInfo(IRCParser.DEBUG_INFO, "Sending mode: %s", sendModeStr.toString());
-        parser.sendRawMessage("MODE " + name + " " + sendModeStr.toString());
+        parser.sendRawMessage("MODE " + name + ' ' + sendModeStr);
         clearModeQueue();
     }
 
@@ -760,7 +760,7 @@ public class IRCChannelInfo implements ChannelInfo {
         if (sMessage.isEmpty()) {
             sendMessage(char1 + sType.toUpperCase() + sMessage + char1);
         } else {
-            sendMessage(char1 + sType.toUpperCase() + " " + sMessage + char1);
+            sendMessage(char1 + sType.toUpperCase() + ' ' + sMessage + char1);
         }
     }
 
@@ -778,7 +778,7 @@ public class IRCChannelInfo implements ChannelInfo {
         if (sMessage.isEmpty()) {
             sendNotice(char1 + sType.toUpperCase() + sMessage + char1);
         } else {
-            sendNotice(char1 + sType.toUpperCase() + " " + sMessage + char1);
+            sendNotice(char1 + sType.toUpperCase() + ' ' + sMessage + char1);
         }
     }
 

src/com/dmdirc/parser/irc/IRCClientInfo.java

@@ -442,15 +442,15 @@ public class IRCClientInfo implements LocalClientInfo {
         }
 
         if (negativemode.length() > 0) {
-            sendModeStr.append("-").append(negativemode);
+            sendModeStr.append('-').append(negativemode);
         }
 
         if (positivemode.length() > 0) {
-            sendModeStr.append("+").append(positivemode);
+            sendModeStr.append('+').append(positivemode);
         }
 
         parser.callDebugInfo(IRCParser.DEBUG_INFO, "Sending mode: %s", sendModeStr.toString());
-        parser.sendRawMessage("MODE " + nickname + " " + sendModeStr.toString());
+        parser.sendRawMessage("MODE " + nickname + ' ' + sendModeStr);
         clearModeQueue();
     }
 

src/com/dmdirc/parser/irc/ProcessMode.java

@@ -252,7 +252,7 @@ public class ProcessMode extends IRCProcessor {
 
         // Call Callbacks
         for (String aSModestr : sModestr) {
-            sFullModeStr.append(aSModestr).append(" ");
+            sFullModeStr.append(aSModestr).append(' ');
         }
 
         iChannel.setMode(nCurrent);

test/com/dmdirc/harness/parser/TestParser.java

@@ -25,8 +25,13 @@ package com.dmdirc.harness.parser;
 import com.dmdirc.parser.common.ChildImplementations;
 import com.dmdirc.parser.common.MyInfo;
 import com.dmdirc.parser.common.QueuePriority;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.irc.*;
+import com.dmdirc.parser.irc.IRCChannelClientInfo;
+import com.dmdirc.parser.irc.IRCChannelInfo;
+import com.dmdirc.parser.irc.IRCClientInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.IRCReader;
+import com.dmdirc.parser.irc.SocketState;
+
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
@@ -38,7 +43,7 @@ import java.util.Timer;
     IRCChannelInfo.class,
     IRCClientInfo.class
 })
-public class TestParser extends IRCParser implements Parser {
+public class TestParser extends IRCParser {
 
     public final List<String> sentLines = new ArrayList<>();
 
@@ -53,7 +58,7 @@ public class TestParser extends IRCParser implements Parser {
         setPingTimerInterval(60000);
     }
 
-    public TestParser(MyInfo myDetails, URI address) {
+    public TestParser(final MyInfo myDetails, final URI address) {
         super(myDetails, address);
         currentSocketState = SocketState.OPEN;
         setPingTimerFraction(10);
@@ -69,28 +74,28 @@ public class TestParser extends IRCParser implements Parser {
     }
 
     @Override
-    protected boolean doSendString(String line, QueuePriority priority, boolean fromParser) {
+    protected boolean doSendString(final String line, final QueuePriority priority, final boolean fromParser) {
         sentLines.add(line);
         return true;
     }
 
-    public String[] getLine(int index) {
+    public String[] getLine(final int index) {
         return tokeniseLine(sentLines.get(index));
     }
 
-    public void injectLine(String line) {
+    public void injectLine(final String line) {
         processLine(new IRCReader.ReadLine(line, IRCParser.tokeniseLine(line)));
     }
 
     public void injectConnectionStrings() {
-        final String[] lines = new String[]{
+        final String[] lines = {
             "NOTICE AUTH :Blah, blah",
             ":server 001 " + nick + " :Welcome to the Testing IRC Network, " + nick,
             ":server 002 " + nick + " :Your host is server.net, running version foo",
             ":server 003 " + nick + " :This server was created Sun Jan 6 2008 at 17:34:54 CET",
             ":server 004 " + nick + " server.net foo dioswkgxRXInP bRIeiklmnopstvrDcCNuMT bklov",
             ":server 005 " + nick + " WHOX WALLCHOPS WALLVOICES USERIP PREFIX=(ov)@+ " +
-                    (network == null ? "" : "NETWORK=" + network + " ") +
+                    (network == null ? "" : "NETWORK=" + network + ' ') +
                     ":are supported by this server",
             ":server 005 " + nick + " MAXNICKLEN=15 TOPICLEN=250 AWAYLEN=160 MODES=6 " +
                     "CHANMODES=bIeR,k,l,imnpstrDducCNMT :are supported by this server",

test/com/dmdirc/parser/common/IgnoreListTest.java

@@ -73,7 +73,7 @@ public class IgnoreListTest {
             boolean except = false;
             
             try {
-                String converted = IgnoreList.regexToSimple(test);
+                IgnoreList.regexToSimple(test);
             } catch (UnsupportedOperationException ex) {
                 except = true;
             }
@@ -84,7 +84,7 @@ public class IgnoreListTest {
     
     @Test
     public void testConstructor() {
-        final List<String> items = Arrays.asList(new String[]{"abc", "def"});
+        final List<String> items = Arrays.asList("abc", "def");
         final IgnoreList list = new IgnoreList(items);
         
         assertEquals(items, list.getRegexList());

test/com/dmdirc/parser/irc/IRCParserIrcdTest.java

@@ -35,7 +35,7 @@ public class IRCParserIrcdTest {
 
     private final String ircd, expected;
 
-    public IRCParserIrcdTest(String ircd, String expected) {
+    public IRCParserIrcdTest(final String ircd, final String expected) {
         this.ircd = ircd;
         this.expected = expected;
     }

test/com/dmdirc/parser/irc/IRCParserTest.java

@@ -49,7 +49,7 @@ import static org.mockito.Mockito.*;
 
 public class IRCParserTest {
 
-    private static interface TestCallback extends CallbackInterface { }
+    private interface TestCallback extends CallbackInterface { }
 
     @Test(expected=CallbackNotFoundException.class)
     public void testIssue42() {

test/com/dmdirc/parser/irc/ParserErrorTest.java

@@ -93,7 +93,7 @@ public class ParserErrorTest {
 
     @Test
     public void testException() {
-        fatal.setException(new Exception("foo"));
+        fatal.setException(new UnsupportedOperationException("foo"));
         
         assertTrue(fatal.isException());
         assertTrue(fatal.isFatal());

test/com/dmdirc/parser/irc/ProcessListModeTest.java

@@ -30,7 +30,7 @@ import static org.junit.Assert.*;
 
 public class ProcessListModeTest {
 
-    private void testListModes(String numeric1, String numeric2, char mode) {
+    private void testListModes(final String numeric1, final String numeric2, final char mode) {
         final TestParser parser = new TestParser();
         parser.injectConnectionStrings();
 

test/com/dmdirc/parser/irc/ProcessNickTest.java

@@ -53,7 +53,7 @@ public class ProcessNickTest {
         assertNotNull(parser.getClient("LUSER"));
         assertEquals(1, parser.getClient("LUSER").getChannelClients().size());
 
-        IRCChannelClientInfo cci = parser.getClient("LUSER").getChannelClients().get(0);
+        final IRCChannelClientInfo cci = parser.getClient("LUSER").getChannelClients().get(0);
         assertEquals(parser.getChannel("#DMDirc_testing"), cci.getChannel());
         assertEquals("+", cci.getChanModeStr(true));
 
@@ -75,7 +75,7 @@ public class ProcessNickTest {
         assertFalse(parser.isKnownClient("luser"));
         assertEquals(1, parser.getClient("foobar").getChannelClients().size());
 
-        IRCChannelClientInfo cci = parser.getClient("foobar").getChannelClients().get(0);
+        final IRCChannelClientInfo cci = parser.getClient("foobar").getChannelClients().get(0);
         assertEquals(parser.getChannel("#DMDirc_testing"), cci.getChannel());
         assertEquals("+", cci.getChanModeStr(true));
     }