Style fixes

Change-Id: Ic91544916082a64c1add84fd9e0b68dd91552c40
Reviewed-on: http://gerrit.dmdirc.com/1598
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>

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

@@ -65,13 +65,9 @@ public abstract class CallbackObjectSpecific extends CallbackObject {
      * @return true if channel given matches the specifics for the method given
      */
     protected boolean isValidChan(final CallbackInterface eMethod, final ChannelInfo cChannel) {
-        if (specificData.containsKey(eMethod)) {
-            if (!myParser.getStringConverter().equalsIgnoreCase(cChannel.getName(),
-                    specificData.get(eMethod))) {
-                return false;
-            }
-        }
-        return true;
+        return !(specificData.containsKey(eMethod) && !myParser
+                .getStringConverter().equalsIgnoreCase(cChannel.getName(),
+                specificData.get(eMethod)));
     }
 
     /**
@@ -83,13 +79,9 @@ public abstract class CallbackObjectSpecific extends CallbackObject {
      */
     protected boolean isValidUser(final CallbackInterface eMethod, final String sHost) {
         final String nickname = translateHostname(sHost);
-        if (specificData.containsKey(eMethod)) {
-            if (!myParser.getStringConverter().equalsIgnoreCase(nickname,
-                    specificData.get(eMethod))) {
-                return false;
-            }
-        }
-        return true;
+        return !(specificData.containsKey(eMethod) && !myParser
+                .getStringConverter().equalsIgnoreCase(nickname,
+                specificData.get(eMethod)));
     }
 
     /**

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

@@ -53,9 +53,10 @@ public class ProcessKick extends IRCProcessor {
         
         if (iClient == null) { return; }
         
-        if (IRCParser.ALWAYS_UPDATECLIENT && iKicker != null) {
+        if ((IRCParser.ALWAYS_UPDATECLIENT && iKicker != null)
+                && iKicker.getHostname().isEmpty()) {
             // To facilitate dmdirc formatter, get user information
-            if (iKicker.getHostname().isEmpty()) { iKicker.setUserBits(token[0], false); }
+            iKicker.setUserBits(token[0], false);
         }
 
         if (iChannel == null) { 

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

@@ -110,33 +110,42 @@ public class ProcessMessage extends IRCProcessor {
         boolean isCTCP = false;
 
         if (sMessage.length() > 1) {
-            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)) {
-                    isAction = true;
-                    if (bits.length > 1) {
-                        sMessage = bits[1];
-                        sMessage = sMessage.substring(0, sMessage.length()-1);
-                    } else { sMessage = ""; }
-                }
+            // Actions are special CTCPs
+            // Bits is the message been split into 2 parts
+            //         the first word and the rest
+            if (sParam.equalsIgnoreCase("PRIVMSG") && bits[0].equalsIgnoreCase(
+                    char1+"ACTION") && Character.valueOf(sMessage.charAt(
+                    sMessage.length()-1)).equals(char1)) {
+                isAction = true;
+                if (bits.length > 1) {
+                    sMessage = bits[1];
+                    sMessage = sMessage.substring(0, sMessage.length()-1);
+                } else { sMessage = ""; }
             }
             // 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)) {
-                    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);
-                    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]; }
-                    callDebugInfo(IRCParser.DEBUG_INFO, "CTCP: \"%s\" \"%s\"", sCTCP, sMessage);
+            // CTCPs have Character(1) at the start/end of the line
+            if (!isAction && 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);
+                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];
                 }
+                callDebugInfo(IRCParser.DEBUG_INFO, "CTCP: \"%s\" \"%s\"",
+                        sCTCP, sMessage);
             }
         }
 
@@ -144,9 +153,10 @@ public class ProcessMessage extends IRCProcessor {
         if (token[0].charAt(0) == ':' && token[0].length() > 1) { token[0] = token[0].substring(1); }
 
         iClient = getClientInfo(token[0]);
-        if (IRCParser.ALWAYS_UPDATECLIENT && iClient != null) {
-            // Facilitate DMDIRC Formatter
-            if (iClient.getHostname().isEmpty()) {iClient.setUserBits(token[0], false); }
+        // Facilitate DMDIRC Formatter
+        if ((IRCParser.ALWAYS_UPDATECLIENT && iClient != null) && iClient
+                .getHostname().isEmpty()) {
+            iClient.setUserBits(token[0], false);
         }
 
         // Fire the appropriate callbacks.

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

@@ -118,9 +118,10 @@ public class ProcessMode extends IRCProcessor {
         if (!sParam.equals("324")) { nCurrent = iChannel.getMode(); }
 
         setterCCI = iChannel.getChannelClient(token[0]);
-        if (IRCParser.ALWAYS_UPDATECLIENT && setterCCI != null) {
-            // Facilitate dmdirc formatter
-            if (setterCCI.getClient().getHostname().isEmpty()) {setterCCI.getClient().setUserBits(token[0], false); }
+        // Facilitate dmdirc formatter
+        if ((IRCParser.ALWAYS_UPDATECLIENT && setterCCI != null) && setterCCI
+                .getClient().getHostname().isEmpty()) {
+            setterCCI.getClient().setUserBits(token[0], false);
         }
 
         // Loop through the mode string, and add/remove modes/params where they are needed

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

@@ -51,10 +51,9 @@ public class ProcessNames extends IRCProcessor {
             iChannel.setAddingNames(false);
             callChannelGotNames(iChannel);
             
-            if (!iChannel.hasAskedForListModes()) {
-                if (myParser.getAutoListMode()) {
-                    iChannel.requestListModes();
-                }
+            if (!iChannel.hasAskedForListModes() 
+                    && myParser.getAutoListMode()) {
+                iChannel.requestListModes();
             }
         } else {
             // Names

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

@@ -199,12 +199,9 @@ public class SimpleRateLimitedQueueHandler extends QueueHandler {
             if (overTime) {
                 // If we are not currently limiting, and this is the items-th item
                 // added in the last limitTime, start limiting.
-                if (!isLimiting) {
-                    if (++count > (items - 1)) {
-                        System.out.println("++ Begin Limiting");
-                        isLimiting = true;
-                        count = 0;
-                    }
+                if (!isLimiting && ++count > (items - 1)) {
+                    isLimiting = true;
+                    count = 0;
                 }
             } else if (!isLimiting) {
                 // If it has been more than limitTime seconds since the last line
@@ -238,10 +235,8 @@ public class SimpleRateLimitedQueueHandler extends QueueHandler {
                 final boolean doSleep;
                 synchronized (this) {
                     doSleep = isLimiting;
-                    if (isLimiting) {
-                        if (queue.size() == 0) {
-                            isLimiting = false;
-                        }
+                    if (isLimiting && queue.size() == 0) {
+                        isLimiting = false;
                     }
                 }