Style fixes

Change-Id: I51d0e3c7975740b1ede5d6226639022bd15a482a
Reviewed-on: http://gerrit.dmdirc.com/1328
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Gregory Holmes <greg@dmdirc.com>

src/com/dmdirc/parser/common/ChannelListModeItem.java

@@ -22,8 +22,6 @@
 
 package com.dmdirc.parser.common;
 
-import com.dmdirc.parser.irc.IRCParser;
-
 /**
  * Contains Channel List Mode information.
  * 

src/com/dmdirc/parser/common/MyInfo.java

@@ -22,8 +22,6 @@
 
 package com.dmdirc.parser.common;
 
-import com.dmdirc.parser.irc.IRCParser;
-
 /**
  * Contains User information.
  * 

src/com/dmdirc/parser/interfaces/LocalClientInfo.java

@@ -66,12 +66,12 @@ public interface LocalClientInfo extends ClientInfo {
      * @param add Whether to add or remove the mode
      * @param mode Character representation of the mode to be altered
      */
-    public void alterMode(boolean add, Character mode);
+    void alterMode(boolean add, Character mode);
 
     /**
      * Flushes any modes that have been queued by the
      * {@link #alterMode(boolean, Character)} method.
      */
-    public void flushModes();
+    void flushModes();
 
 }

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

@@ -23,7 +23,6 @@
 package com.dmdirc.parser.irc;
 
 import com.dmdirc.parser.common.AwayState;
-import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.LocalClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
 

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

@@ -54,7 +54,7 @@ public class IRCStringConverter implements StringConverter {
      */
     public IRCStringConverter(final byte limit) {
         // If limit is out side the boundries, use rfc1459
-        if (limit > 4 || limit < 0 ) { this.limit = (byte)4; }
+        if (limit > 4 || limit < 0) { this.limit = (byte)4; }
         else { this.limit = limit; }
         
         lowercase = new char[127];

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

@@ -101,6 +101,6 @@ public class Process001 extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected Process001 (IRCParser parser, ProcessingManager manager) { super(parser, manager); }
+    protected Process001(IRCParser parser, ProcessingManager manager) { super(parser, manager); }
 
 }

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

@@ -156,6 +156,6 @@ public class Process004005 extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected Process004005 (final IRCParser parser, final ProcessingManager manager) { super(parser, manager); }
+    protected Process004005(final IRCParser parser, final ProcessingManager manager) { super(parser, manager); }
 
 }

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

@@ -67,6 +67,6 @@ public class Process464 extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected Process464 (IRCParser parser, ProcessingManager manager) { super(parser, manager); }
+    protected Process464(IRCParser parser, ProcessingManager manager) { super(parser, manager); }
 
 }

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

@@ -76,6 +76,6 @@ public class ProcessAway extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessAway (IRCParser parser, ProcessingManager manager) { super(parser, manager); }
+    protected ProcessAway(IRCParser parser, ProcessingManager manager) { super(parser, manager); }
 
 }

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

@@ -70,6 +70,6 @@ public class ProcessInvite extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessInvite (IRCParser parser, ProcessingManager manager) { super(parser, manager); }
+    protected ProcessInvite(IRCParser parser, ProcessingManager manager) { super(parser, manager); }
 
 }

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

@@ -143,6 +143,6 @@ public class ProcessJoin extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessJoin (IRCParser parser, ProcessingManager manager) { super(parser, manager); }
+    protected ProcessJoin(IRCParser parser, ProcessingManager manager) { super(parser, manager); }
 
 }

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

@@ -112,6 +112,6 @@ public class ProcessKick extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessKick (IRCParser parser, ProcessingManager manager) { super(parser, manager); }
+    protected ProcessKick(IRCParser parser, ProcessingManager manager) { super(parser, manager); }
 
 }

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

@@ -259,6 +259,6 @@ public class ProcessListModes extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessListModes (IRCParser parser, ProcessingManager manager) { super(parser, manager); }
+    protected ProcessListModes(IRCParser parser, ProcessingManager manager) { super(parser, manager); }
 
 }

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

@@ -98,6 +98,6 @@ public class ProcessMOTD extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessMOTD (IRCParser parser, ProcessingManager manager) { super(parser, manager); }
+    protected ProcessMOTD(IRCParser parser, ProcessingManager manager) { super(parser, manager); }
 
 }

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

@@ -103,8 +103,8 @@ public class ProcessMessage extends IRCProcessor {
         } else {
             sMessage = token[token.length-1];
         }
-        String bits[] = sMessage.split(" ", 2);
-        final Character Char1 = Character.valueOf((char)1);
+        String[] bits = sMessage.split(" ", 2);
+        final Character char1 = Character.valueOf((char)1);
         String sCTCP = "";
         boolean isAction = false;
         boolean isCTCP = false;
@@ -113,7 +113,7 @@ public class ProcessMessage extends IRCProcessor {
             if (sParam.equalsIgnoreCase("PRIVMSG")) {
                 // Actions are special CTCPs
                 // Bits is the message been split into 2 parts, the first word and the rest
-                if (bits[0].equalsIgnoreCase(Char1+"ACTION") && Character.valueOf(sMessage.charAt(sMessage.length()-1)).equals(Char1)) {
+                if (bits[0].equalsIgnoreCase(char1+"ACTION") && Character.valueOf(sMessage.charAt(sMessage.length()-1)).equals(char1)) {
                     isAction = true;
                     if (bits.length > 1) {
                         sMessage = bits[1];
@@ -124,17 +124,17 @@ public class ProcessMessage extends IRCProcessor {
             // If the message is not an action, check if it is another type of CTCP
             if (!isAction) {
                 // CTCPs have Character(1) at the start/end of the line
-                if (Character.valueOf(sMessage.charAt(0)).equals(Char1) && Character.valueOf(sMessage.charAt(sMessage.length()-1)).equals(Char1)) {
+                if (Character.valueOf(sMessage.charAt(0)).equals(char1) && Character.valueOf(sMessage.charAt(sMessage.length()-1)).equals(char1)) {
                     isCTCP = true;
                     // Bits is the message been split into 2 parts, the first word and the rest
                     // Some CTCPs have messages and some do not
                     if (bits.length > 1) { sMessage = bits[1]; } else { sMessage = ""; }
                     // Remove the leading char1
-                    bits = bits[0].split(Char1.toString(),2);
+                    bits = bits[0].split(char1.toString(),2);
                     sCTCP = bits[1];
                     // remove the trailing char1
-                    if (!sMessage.isEmpty()) { sMessage = sMessage.split(Char1.toString(),2)[0]; }
-                    else { sCTCP = sCTCP.split(Char1.toString(),2)[0]; }
+                    if (!sMessage.isEmpty()) { sMessage = sMessage.split(char1.toString(),2)[0]; }
+                    else { sCTCP = sCTCP.split(char1.toString(),2)[0]; }
                     callDebugInfo(IRCParser.DEBUG_INFO, "CTCP: \"%s\" \"%s\"",sCTCP,sMessage);
                 }
             }
@@ -515,6 +515,6 @@ public class ProcessMessage extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessMessage (IRCParser parser, ProcessingManager manager) { super(parser, manager); }
+    protected ProcessMessage(IRCParser parser, ProcessingManager manager) { super(parser, manager); }
 
 }

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

@@ -84,7 +84,7 @@ public class ProcessMode extends IRCProcessor {
      * @param sModestr The modes and params
      * @param sChannelName Channel these modes are for
      */    
-    public void processChanMode(String sParam, String token[], String sModestr[], String sChannelName) {
+    public void processChanMode(String sParam, String[] token, String[] sModestr, String sChannelName) {
         StringBuilder sFullModeStr = new StringBuilder();
         String sNonUserModeStr = "";
         String sNonUserModeStrParams = "";
@@ -184,9 +184,9 @@ public class ProcessMode extends IRCProcessor {
                         sModeParam = sModestr[nParam++];
                         sNonUserModeStrParams = sNonUserModeStrParams+" "+sModeParam;
                         nTemp = (Calendar.getInstance().getTimeInMillis() / 1000);
-                        iChannel.setListModeParam(cMode, new ChannelListModeItem(sModeParam, token[0], nTemp ), bPositive);
+                        iChannel.setListModeParam(cMode, new ChannelListModeItem(sModeParam, token[0], nTemp), bPositive);
                         callDebugInfo(IRCParser.DEBUG_INFO, "List Mode: %c [%s] {Positive: %b}",cMode, sModeParam, bPositive);
-                        if (cbSingle != null) { cbSingle.call(iChannel, setterCCI, token[0], cPositive+cMode+" "+sModeParam ); }
+                        if (cbSingle != null) { cbSingle.call(iChannel, setterCCI, token[0], cPositive+cMode+" "+sModeParam); }
                     } else {
                         // Mode with a parameter
                         if (bPositive) { 
@@ -195,7 +195,7 @@ public class ProcessMode extends IRCProcessor {
                             sNonUserModeStrParams = sNonUserModeStrParams+" "+sModeParam;
                             callDebugInfo(IRCParser.DEBUG_INFO, "Set Mode: %c [%s] {Positive: %b}",cMode, sModeParam, bPositive);
                             iChannel.setModeParam(cMode,sModeParam);
-                            if (cbSingle != null) { cbSingle.call(iChannel, setterCCI, token[0], cPositive+cMode+" "+sModeParam ); }
+                            if (cbSingle != null) { cbSingle.call(iChannel, setterCCI, token[0], cPositive+cMode+" "+sModeParam); }
                         } else {
                             // -Mode - parameter isn't always needed, we need to check
                             if ((nValue & IRCParser.MODE_UNSET) == IRCParser.MODE_UNSET) {
@@ -206,7 +206,7 @@ public class ProcessMode extends IRCProcessor {
                             }
                             callDebugInfo(IRCParser.DEBUG_INFO, "Unset Mode: %c [%s] {Positive: %b}",cMode, sModeParam, bPositive);
                             iChannel.setModeParam(cMode,"");
-                            if (cbSingle != null) { cbSingle.call(iChannel, setterCCI, token[0], trim(cPositive+cMode+" "+sModeParam) ); }
+                            if (cbSingle != null) { cbSingle.call(iChannel, setterCCI, token[0], trim(cPositive+cMode+" "+sModeParam)); }
                         }
                     }
                 }
@@ -229,7 +229,7 @@ public class ProcessMode extends IRCProcessor {
      * @param token IRCTokenised Array of the incomming line
      * @param clearOldModes Clear old modes before applying these modes (used by 221)
      */    
-    private void processUserMode(String sParam, String token[], String sModestr[], boolean clearOldModes) {
+    private void processUserMode(String sParam, String[] token, String[] sModestr, boolean clearOldModes) {
         long nCurrent = 0, nValue = 0;
         boolean bPositive = true;
         
@@ -342,6 +342,6 @@ public class ProcessMode extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessMode (IRCParser parser, ProcessingManager manager) { super(parser, manager); }
+    protected ProcessMode(IRCParser parser, ProcessingManager manager) { super(parser, manager); }
 
 }

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

@@ -147,6 +147,6 @@ public class ProcessNames extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessNames (IRCParser parser, ProcessingManager manager) { super(parser, manager); }
+    protected ProcessNames(IRCParser parser, ProcessingManager manager) { super(parser, manager); }
 
 }

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

@@ -126,6 +126,6 @@ public class ProcessNick extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessNick (IRCParser parser, ProcessingManager manager) { super(parser, manager); }
+    protected ProcessNick(IRCParser parser, ProcessingManager manager) { super(parser, manager); }
 
 }

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

@@ -94,6 +94,6 @@ public class ProcessNickInUse extends IRCProcessor {
      * @param parser IRCParser That owns this object
      * @param manager ProcessingManager that is in charge of this object
      */
-    protected ProcessNickInUse (final IRCParser parser, final ProcessingManager manager) { super(parser, manager); }
+    protected ProcessNickInUse(final IRCParser parser, final ProcessingManager manager) { super(parser, manager); }
 
 }

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

@@ -66,6 +66,6 @@ public class ProcessNoticeAuth extends IRCProcessor {
      * @param parser IRCParser That owns this object
      * @param manager ProcessingManager that is in charge of this object
      */
-    protected ProcessNoticeAuth (final IRCParser parser, final ProcessingManager manager) { super(parser, manager); }
+    protected ProcessNoticeAuth(final IRCParser parser, final ProcessingManager manager) { super(parser, manager); }
 
 }

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

@@ -108,6 +108,6 @@ public class ProcessPart extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessPart (IRCParser parser, ProcessingManager manager) { super(parser, manager); }
+    protected ProcessPart(IRCParser parser, ProcessingManager manager) { super(parser, manager); }
 
 }

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

@@ -123,6 +123,6 @@ public class ProcessQuit extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessQuit (IRCParser parser, ProcessingManager manager) { super(parser, manager); }
+    protected ProcessQuit(IRCParser parser, ProcessingManager manager) { super(parser, manager); }
 
 }

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

@@ -98,6 +98,6 @@ public class ProcessTopic extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessTopic (IRCParser parser, ProcessingManager manager) { super(parser, manager); }
+    protected ProcessTopic(IRCParser parser, ProcessingManager manager) { super(parser, manager); }
 
 }

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

@@ -110,6 +110,6 @@ public class ProcessWallops extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessWallops (IRCParser parser, ProcessingManager manager) { super(parser, manager); }
+    protected ProcessWallops(IRCParser parser, ProcessingManager manager) { super(parser, manager); }
 
 }

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

@@ -139,6 +139,6 @@ public class ProcessWho extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessWho (IRCParser parser, ProcessingManager manager) { super(parser, manager); }
+    protected ProcessWho(IRCParser parser, ProcessingManager manager) { super(parser, manager); }
 
 }

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

@@ -62,7 +62,7 @@ public class ServerInfo {
     private URI uri = null;
 
     /** Constructor using Default values. */
-    public ServerInfo () { }
+    public ServerInfo() { }
 
     /**
      * Constructor using specifed host, port and password, SSL/Proxy must be specifed separately.
@@ -71,7 +71,7 @@ public class ServerInfo {
      * @param serverPort Port to use
      * @param serverPass Password to use
      */
-    public ServerInfo (final String serverHost, final int serverPort, final String serverPass) {
+    public ServerInfo(final String serverHost, final int serverPort, final String serverPass) {
         host = serverHost;
         port = serverPort;
         password = serverPass;

src/com/dmdirc/parser/irc/outputqueue/QueueFactory.java

@@ -23,6 +23,7 @@ public interface QueueFactory {
      * @param out Where to send crap.
      * @return the new queue handler object.
      */
-    public QueueHandler getQueueHandler(final OutputQueue outputQueue, final BlockingQueue<QueueItem> queue, final PrintWriter out);
+    QueueHandler getQueueHandler(final OutputQueue outputQueue,
+            final BlockingQueue<QueueItem> queue, final PrintWriter out);
 
 }

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

@@ -60,7 +60,7 @@ public class ChannelClientInfoTest {
         assertEquals("", cci.getImportantModePrefix());
         assertEquals("luser", cci.toString());
         assertEquals("luser", cci.toFullString());
-        assertEquals(0l, cci.getImportantModeValue());
+        assertEquals(0L, cci.getImportantModeValue());
     }
     
     @Test

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

@@ -60,16 +60,16 @@ public class ChannelInfoTest {
 
     @Test
     public void testCreateTime() {
-        ci.setCreateTime(12345l);
+        ci.setCreateTime(12345L);
 
-        assertEquals(12345l, ci.getCreateTime());
+        assertEquals(12345L, ci.getCreateTime());
     }
 
     @Test
     public void testTopicTime() {
-        ci.setTopicTime(12345l);
+        ci.setTopicTime(12345L);
 
-        assertEquals(12345l, ci.getTopicTime());
+        assertEquals(12345L, ci.getTopicTime());
     }
 
     @Test

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

@@ -49,17 +49,17 @@ public class ProcessListModeTest {
         for (ChannelListModeItem item : items) {
             if (item.getItem().equals("ban1!ident@.host")) {
                 assertEquals("bansetter1", item.getOwner());
-                assertEquals(1001l, item.getTime());
+                assertEquals(1001L, item.getTime());
                 assertFalse(gotOne);
                 gotOne = true;
             } else if (item.getItem().equals("ban2!*@.host")) {
                 assertEquals("bansetter2", item.getOwner());
-                assertEquals(1002l, item.getTime());
+                assertEquals(1002L, item.getTime());
                 assertFalse(gotTwo);
                 gotTwo = true;
             } else if (item.toString().equals("ban3!ident@*")) {
                 assertEquals("bansetter3", item.getOwner());
-                assertEquals(1003l, item.getTime());
+                assertEquals(1003L, item.getTime());
                 assertFalse(gotThree);
                 gotThree = true;
             }