Style/license fixes

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

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

@@ -1,23 +1,23 @@
 /*
- *  Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- *  The above copyright notice and this permission notice shall be included in
- *  all copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *  SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 package com.dmdirc.parser.common;

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

@@ -1,31 +1,29 @@
 /*
- *  Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- *  The above copyright notice and this permission notice shall be included in
- *  all copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *  SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 package com.dmdirc.parser.common;
 
 /**
  * Queue Priority.
- *
- * @author shane
  */
 public enum QueuePriority {
     /** High priority. */

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

@@ -29,7 +29,6 @@ import java.util.Map;
  * interact with it.
  *
  * @since 0.6.3m2
- * @author chris
  */
 public interface ChannelClientInfo extends Comparable<ChannelClientInfo> {
 

src/com/dmdirc/parser/interfaces/callbacks/ChannelNickChangeListener.java

@@ -47,7 +47,6 @@ public interface ChannelNickChangeListener extends CallbackInterface {
      * @param oldNick Nickname before change
      * @see com.dmdirc.parser.irc.ProcessNick#callChannelNickChanged
      */
-     void onChannelNickChanged(Parser parser, Date date, ChannelInfo channel,
-             ChannelClientInfo client, String oldNick);
-
+    void onChannelNickChanged(Parser parser, Date date, ChannelInfo channel,
+            ChannelClientInfo client, String oldNick);
 }

src/com/dmdirc/parser/interfaces/callbacks/PrivateNoticeListener.java

@@ -47,5 +47,4 @@ public interface PrivateNoticeListener extends CallbackInterface {
      * @see com.dmdirc.parser.irc.ProcessMessage#callPrivateNotice
      */
     void onPrivateNotice(Parser parser, Date date, String message, String host);
-
-}
+}

src/com/dmdirc/parser/interfaces/callbacks/UnknownActionListener.java

@@ -28,15 +28,11 @@ import java.util.Date;
 
 /**
  * Called when a person sends an action not aimed specifically at you or a channel (ie $*).
- * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
- * cClient is null if user is a server, or not on any common channel.
  */
 public interface UnknownActionListener extends CallbackInterface {
 
     /**
      * Called when a person sends an action not aimed specifically at you or a channel (ie $*).
-     * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
-     * cClient is null if user is a server, or not on any common channel.
      *
      * @param parser Reference to the parser object that made the callback.
      * @param date The date/time at which the event occured
@@ -47,5 +43,4 @@ public interface UnknownActionListener extends CallbackInterface {
      */
     void onUnknownAction(Parser parser, Date date, String message,
             String target, String host);
-
-}
+}

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

@@ -539,7 +539,8 @@ public class IRCChannelInfo implements ChannelInfo {
         if (!listModes.containsKey(cMode)) {
             listModes.put(cMode, new ArrayList<ChannelListModeItem>());
         }
-        final ArrayList<ChannelListModeItem> lModes = listModes.get(cMode);
+
+        final List<ChannelListModeItem> lModes = listModes.get(cMode);
         for (int i = 0; i < lModes.size(); i++) {
             if (parser.getStringConverter().equalsIgnoreCase(lModes.get(i).getItem(), newItem.getItem())) {
                 if (bAdd) {
@@ -628,9 +629,9 @@ public class IRCChannelInfo implements ChannelInfo {
             return;
         }
 
-        modestr = ((add) ? "+" : "-") + mode;
+        modestr = (add ? "+" : "-") + mode;
         if (parser.chanModesBool.containsKey(mode)) {
-            final String teststr = ((add) ? "-" : "+") + mode;
+            final String teststr = (add ? "-" : "+") + mode;
             if (modeQueue.contains(teststr)) {
                 modeQueue.remove(teststr);
                 return;
@@ -650,7 +651,7 @@ public class IRCChannelInfo implements ChannelInfo {
                 } else if (add && ((modeint & IRCParser.MODE_SET) == IRCParser.MODE_SET)) {
                     // Does mode require a param to unset aswell?
                     // We might need to queue an unset first
-                    if (((modeint & IRCParser.MODE_UNSET) == IRCParser.MODE_UNSET)) {
+                    if ((modeint & IRCParser.MODE_UNSET) == IRCParser.MODE_UNSET) {
                         final String existingParam = getMode(mode);
                         if (!existingParam.isEmpty()) {
                             final String reverseModeStr = "-" + mode + " " + existingParam;

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

@@ -53,6 +53,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Deque;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -790,11 +791,10 @@ public class IRCParser implements SecureParser, EncodingParser, Runnable {
      * Connect to IRC.
      *
      * @throws IOException if the socket can not be connected
-     * @throws UnknownHostException if the hostname can not be resolved
      * @throws NoSuchAlgorithmException if SSL is not available
      * @throws KeyManagementException if the trustManager is invalid
      */
-    private void connect() throws UnknownHostException, IOException, NoSuchAlgorithmException, KeyManagementException {
+    private void connect() throws IOException, NoSuchAlgorithmException, KeyManagementException {
         if (server == null) {
             throw new UnknownHostException("Unspecified host.");
         }
@@ -1127,12 +1127,11 @@ public class IRCParser implements SecureParser, EncodingParser, Runnable {
         if (newLine[0].equalsIgnoreCase("away") && newLine.length > 1) {
             myself.setAwayReason(newLine[newLine.length - 1]);
         } else if (newLine[0].equalsIgnoreCase("mode") && newLine.length == 3) {
-            // This makes sure we don't add the same item to the LMQ twice, even if its requested twice,
-            // as the ircd will only reply once.
-            final LinkedList<Character> foundModes = new LinkedList<Character>();
-
             final IRCChannelInfo channel = getChannel(newLine[1]);
             if (channel != null) {
+                // This makes sure we don't add the same item to the LMQ twice,
+                // even if its requested twice, as the ircd will only reply once
+                final Deque<Character> foundModes = new LinkedList<Character>();
                 final Queue<Character> listModeQueue = channel.getListModeQueue();
                 for (int i = 0; i < newLine[2].length(); ++i) {
                     final Character mode = newLine[2].charAt(i);

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

@@ -80,20 +80,6 @@ public class Logging {
     /** "Log" object if available. */
     private Object log;
 
-    /**
-     * Get an instance of Logging.
-     *
-     * @return The instance of Logging
-     */
-    public static Logging getLogging() {
-        synchronized (Logging.class) {
-            if (me == null) {
-                me = new Logging();
-            }
-            return me;
-        }
-    }
-
     /** Create a new Logging. */
     @SuppressWarnings("unchecked")
     private Logging() {
@@ -104,7 +90,7 @@ public class Logging {
             Class.forName("org.apache.commons.logging.Log");
             factory = Class.forName("org.apache.commons.logging.LogFactory");
 
-            classExists = (factory != null);
+            classExists = factory != null;
             if (classExists) {
                 final Method getLog = factory.getMethod("getLog", new Class[]{Class.class});
                 log = getLog.invoke(null, this.getClass());
@@ -115,7 +101,21 @@ public class Logging {
         } catch (InvocationTargetException ite) {
         }
 
-        isAvailable = (classExists && log != null);
+        isAvailable = classExists && log != null;
+    }
+
+    /**
+     * Get an instance of Logging.
+     *
+     * @return The instance of Logging
+     */
+    public static Logging getLogging() {
+        synchronized (Logging.class) {
+            if (me == null) {
+                me = new Logging();
+            }
+            return me;
+        }
     }
 
     /**

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

@@ -51,7 +51,6 @@ public class ProcessListModes extends IRCProcessor {
      * @param sParam Type of line to process
      * @param token IRCTokenised line to process
      */
-    @SuppressWarnings("unchecked")
     @Override
     public void process(final String sParam, final String[] token) {
         final IRCChannelInfo channel = getChannel(token[3]);
@@ -67,16 +66,16 @@ public class ProcessListModes extends IRCProcessor {
             return;
         }
 
-        if (sParam.equals("367") || sParam.equals("368")) {
+        if ("367".equals(sParam) || "368".equals(sParam)) {
             // Ban List/Item.
             // (Also used for +d and +q on dancer/hyperion... -_-)
             // (Also used for +q on ircd-seven... -_-)
             mode = 'b';
-            isItem = sParam.equals("367");
-        } else if (sParam.equals("348") || sParam.equals("349")) {
+            isItem = "367".equals(sParam);
+        } else if ("348".equals(sParam) || "349".equals(sParam)) {
             // Except / Exempt List etc
             mode = 'e';
-            isItem = sParam.equals("348");
+            isItem = "348".equals(sParam);
         } else if (sParam.equals("346") || sParam.equals("347")) {
             // Invite List
             mode = 'I';
@@ -115,7 +114,7 @@ public class ProcessListModes extends IRCProcessor {
 
         final Queue<Character> listModeQueue = channel.getListModeQueue();
         if (!isCleverMode && listModeQueue != null) {
-            if (sParam.equals("482")) {
+            if ("482".equals(sParam)) {
                 parser.callDebugInfo(IRCParser.DEBUG_LMQ, "Dropped LMQ mode " + listModeQueue.poll());
                 return;
             } else {
@@ -132,23 +131,22 @@ public class ProcessListModes extends IRCProcessor {
                     // Only raise an LMQ error if the lmqmode isn't one of bdq if the
                     // guess is one of bdq
                     if (ServerTypeGroup.FREENODE.isMember(serverType) && (mode == 'b' || mode == 'q' || mode == 'd')) {
-                        final LinkedList<Character> lmq = (LinkedList<Character>) listModeQueue;
                         if (mode == 'b') {
-                            error = !(oldMode == 'q' || oldMode == 'd');
-                            lmq.remove((Character) 'q');
+                            error = oldMode != 'q' && oldMode != 'd';
+                            listModeQueue.remove('q');
                             parser.callDebugInfo(IRCParser.DEBUG_LMQ, "Dropping q from list");
                         } else if (mode == 'q') {
-                            error = !(oldMode == 'b' || oldMode == 'd');
-                            lmq.remove((Character) 'b');
+                            error = oldMode != 'b' && oldMode != 'd';
+                            listModeQueue.remove('b');
                             parser.callDebugInfo(IRCParser.DEBUG_LMQ, "Dropping b from list");
                         } else if (mode == 'd') {
-                            error = !(oldMode == 'b' || oldMode == 'q');
+                            error = oldMode != 'b' && oldMode != 'q';
                         }
                     } else if (ServerTypeGroup.CHARYBDIS.isMember(serverType) && (mode == 'b' || mode == 'q')) {
                         // Finally freenode appear to have an ircd which isn't completely annoying.
                         // Only error if the LMQ thinks the mode should be
                         // something thats not the other one of these 2 modes.
-                        error = (mode == 'b') ? oldMode != 'q' : oldMode != 'b';
+                        error = oldMode != (mode == 'b' ? 'q' : 'b');
                     }
 
                     // If the lmq and the actual mode are not the same or the
@@ -166,7 +164,7 @@ public class ProcessListModes extends IRCProcessor {
         }
 
         if (isItem) {
-            if ((!isCleverMode) && listModeQueue == null && ServerTypeGroup.FREENODE.isMember(serverType) && token.length > 4 && mode == 'b') {
+            if (!isCleverMode && listModeQueue == null && ServerTypeGroup.FREENODE.isMember(serverType) && token.length > 4 && mode == 'b') {
                 // Assume mode is a 'd' mode
                 mode = 'd';
                 // Now work out if its not (or attempt to.)

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

@@ -195,8 +195,8 @@ public class ProcessMessage extends IRCProcessor {
         // handled as if the prefix wasn't used. This can be changed in the future
         // if desired.
         final char modePrefix = token[2].charAt(0);
-        final boolean hasModePrefix = (parser.prefixMap.containsKey(modePrefix) && !parser.prefixModes.containsKey(modePrefix));
-        final String targetName = (hasModePrefix) ? token[2].substring(1) : token[2];
+        final boolean hasModePrefix = parser.prefixMap.containsKey(modePrefix) && !parser.prefixModes.containsKey(modePrefix);
+        final String targetName = hasModePrefix ? token[2].substring(1) : token[2];
 
         if (isValidChannelName(targetName)) {
             iChannel = getChannel(targetName);

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

@@ -216,7 +216,7 @@ public class ProcessMode extends IRCProcessor {
                         // List Mode
                         sModeParam = sModestr[nParam++];
                         sNonUserModeStrParams = sNonUserModeStrParams + " " + sModeParam;
-                        nTemp = (Calendar.getInstance().getTimeInMillis() / 1000);
+                        nTemp = Calendar.getInstance().getTimeInMillis() / 1000;
                         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) {

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

@@ -29,6 +29,7 @@ import com.dmdirc.parser.interfaces.callbacks.ChannelQuitListener;
 import com.dmdirc.parser.interfaces.callbacks.QuitListener;
 
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Process a Quit message.
@@ -75,7 +76,7 @@ public class ProcessQuit extends IRCProcessor {
             sReason = token[token.length - 1];
         }
 
-        final ArrayList<IRCChannelInfo> channelList = new ArrayList<IRCChannelInfo>(parser.getChannels());
+        final List<IRCChannelInfo> channelList = new ArrayList<IRCChannelInfo>(parser.getChannels());
         for (IRCChannelInfo iChannel : channelList) {
             iChannelClient = iChannel.getChannelClient(iClient);
             if (iChannelClient != null) {

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

@@ -39,7 +39,7 @@ public class ServerInfo {
      */
     private static final long serialVersionUID = 1;
     /** Are we using a socks proxy (Default: false). */
-    private boolean useSocksProxy = false;
+    private boolean useSocksProxy;
     /** Proxy server to connect to (Default: "127.0.0.1"). */
     private String proxyHost = "127.0.0.1";
     /** Port server listens on for client connections (Default: 8080). */
@@ -49,7 +49,7 @@ public class ServerInfo {
     /** Proxy password if required. */
     private String proxyPass = "";
     /** URI used to create this ServerInfo if applicable. */
-    private URI uri = null;
+    private URI uri;
 
     /**
      * Constructor using specifed host, port and password, SSL/Proxy must be

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

@@ -1,23 +1,23 @@
 /*
- *  Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- *  The above copyright notice and this permission notice shall be included in
- *  all copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *  SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 package com.dmdirc.parser.irc;
@@ -231,7 +231,7 @@ public enum ServerType {
      * @return
      */
     public boolean isOpOnly(final char mode) {
-        return (opOnly.indexOf(mode) != -1);
+        return opOnly.indexOf(mode) != -1;
     }
 
     /**

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

@@ -1,23 +1,23 @@
 /*
- *  Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- *  The above copyright notice and this permission notice shall be included in
- *  all copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *  SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 package com.dmdirc.parser.irc;

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

@@ -1,23 +1,23 @@
 /*
- *  Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- *  The above copyright notice and this permission notice shall be included in
- *  all copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *  SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 package com.dmdirc.parser.irc.outputqueue;

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

@@ -1,23 +1,23 @@
 /*
- *  Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- *  The above copyright notice and this permission notice shall be included in
- *  all copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *  SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 package com.dmdirc.parser.irc.outputqueue;
@@ -30,6 +30,17 @@ import java.util.concurrent.BlockingQueue;
  */
 public class PriorityQueueHandler extends QueueHandler {
 
+    /**
+     * Create a new PriorityQueueHandler.
+     *
+     * @param outputQueue Owner of this Queue Handler
+     * @param queue Queue to use
+     * @param out Output Stream to use
+     */
+    public PriorityQueueHandler(final OutputQueue outputQueue, final BlockingQueue<QueueItem> queue, final PrintWriter out) {
+        super(outputQueue, queue, out);
+    }
+
     /**
      * Get a QueueFactory that produces PriorityQueueHandlers.
      *
@@ -46,17 +57,6 @@ public class PriorityQueueHandler extends QueueHandler {
         };
     }
 
-    /**
-     * Create a new PriorityQueueHandler.
-     *
-     * @param outputQueue Owner of this Queue Handler
-     * @param queue Queue to use
-     * @param out Output Stream to use
-     */
-    public PriorityQueueHandler(final OutputQueue outputQueue, final BlockingQueue<QueueItem> queue, final PrintWriter out) {
-        super(outputQueue, queue, out);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void run() {

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

@@ -1,23 +1,23 @@
 /*
- *  Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- *  The above copyright notice and this permission notice shall be included in
- *  all copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *  SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 package com.dmdirc.parser.irc.outputqueue;

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

@@ -1,23 +1,23 @@
 /*
- *  Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- *  The above copyright notice and this permission notice shall be included in
- *  all copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *  SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 package com.dmdirc.parser.irc.outputqueue;
@@ -35,10 +35,10 @@ public abstract class QueueHandler extends Thread implements Comparator<QueueIte
 
     /** Queue we are handling. */
     protected final BlockingQueue<QueueItem> queue;
-    /** Where to send the output. */
-    private final PrintWriter out;
     /** The output queue that owns us. */
     protected OutputQueue outputQueue;
+    /** Where to send the output. */
+    private final PrintWriter out;
 
     /**
      * Create a new Queue Thread.

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

@@ -1,23 +1,23 @@
 /*
- *  Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- *  The above copyright notice and this permission notice shall be included in
- *  all copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *  SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 package com.dmdirc.parser.irc.outputqueue;
@@ -30,7 +30,7 @@ import com.dmdirc.parser.common.QueuePriority;
 public class QueueItem implements Comparable<QueueItem> {
 
     /** Global Item Number. */
-    private static long number = 0L;
+    private static long number;
     /** Line to send. */
     private final String line;
     /** Time this line was added. */
@@ -42,6 +42,22 @@ public class QueueItem implements Comparable<QueueItem> {
     /** Our handler. */
     private final QueueHandler handler;
 
+    /**
+     * Create a new QueueItem.
+     *
+     * @param handler Handler for this QueueItem
+     * @param line Line to send
+     * @param priority Priority for the queue item
+     */
+    public QueueItem(final QueueHandler handler, final String line, final QueuePriority priority) {
+        this.handler = handler;
+        this.line = line;
+        this.priority = priority;
+
+        this.time = System.currentTimeMillis();
+        this.itemNumber = number++;
+    }
+
     /**
      * Get the value of line.
      *
@@ -78,22 +94,6 @@ public class QueueItem implements Comparable<QueueItem> {
         return priority;
     }
 
-    /**
-     * Create a new QueueItem.
-     *
-     * @param handler Handler for this QueueItem
-     * @param line Line to send
-     * @param priority Priority for the queue item
-     */
-    public QueueItem(final QueueHandler handler, final String line, final QueuePriority priority) {
-        this.handler = handler;
-        this.line = line;
-        this.priority = priority;
-
-        this.time = System.currentTimeMillis();
-        this.itemNumber = number++;
-    }
-
     /**
      * Compare objects.
      * This will use the compareQueueItem method of the current QueueHandler.

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

@@ -1,28 +1,29 @@
 /*
- *  Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- *  The above copyright notice and this permission notice shall be included in
- *  all copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *  SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 package com.dmdirc.parser.irc.outputqueue;
 
 import com.dmdirc.parser.common.QueuePriority;
+
 import java.io.PrintWriter;
 import java.util.concurrent.BlockingQueue;
 
@@ -34,21 +35,6 @@ import java.util.concurrent.BlockingQueue;
  */
 public class SimpleRateLimitedQueueHandler extends QueueHandler {
 
-    /**
-     * Get a QueueFactory that produces PriorityQueueHandlers.
-     *
-     * @return a QueueFactory that produces PrirortyQueueHandlers.
-     */
-    public static QueueFactory getFactory() {
-        return new QueueFactory() {
-
-            /** {@inheritDoc} */
-            @Override
-            public QueueHandler getQueueHandler(final OutputQueue outputQueue, final BlockingQueue<QueueItem> queue, final PrintWriter out) {
-                return new SimpleRateLimitedQueueHandler(outputQueue, queue, out);
-            }
-        };
-    }
     /** Current count. */
     private int count;
     /** Time last item was added. */
@@ -75,6 +61,22 @@ public class SimpleRateLimitedQueueHandler extends QueueHandler {
         super(outputQueue, queue, out);
     }
 
+    /**
+     * Get a QueueFactory that produces PriorityQueueHandlers.
+     *
+     * @return a QueueFactory that produces PrirortyQueueHandlers.
+     */
+    public static QueueFactory getFactory() {
+        return new QueueFactory() {
+
+            /** {@inheritDoc} */
+            @Override
+            public QueueHandler getQueueHandler(final OutputQueue outputQueue, final BlockingQueue<QueueItem> queue, final PrintWriter out) {
+                return new SimpleRateLimitedQueueHandler(outputQueue, queue, out);
+            }
+        };
+    }
+
     /**
      * Get the number of items needed to activate rate limiting.
      *
@@ -188,7 +190,7 @@ public class SimpleRateLimitedQueueHandler extends QueueHandler {
     public QueueItem getQueueItem(final String line, final QueuePriority priority) {
         // Was the last line added less than limitTime ago?
         synchronized (this) {
-            final boolean overTime = (lastItemTime + limitTime > System.currentTimeMillis());
+            final boolean overTime = lastItemTime + limitTime > System.currentTimeMillis();
             if (overTime) {
                 // If we are not currently limiting, and this is the items-th item
                 // added in the last limitTime, start limiting.
@@ -196,18 +198,19 @@ public class SimpleRateLimitedQueueHandler extends QueueHandler {
                     isLimiting = true;
                     count = 0;
                 }
-            } else if (!isLimiting) {
-                // If it has been more than limitTime seconds since the last line
-                // and we are not currently limiting, reset the count.
-                count = 0;
-            } else {
+            } else if (isLimiting) {
                 // It has been longer than limitTime and we are still shown as
                 // limiting, check to see if the queue is empty or not, if it is
                 // disable limiting.
                 if (queue.size() == 0) {
                     isLimiting = false;
                 }
+            } else {
+                // If it has been more than limitTime seconds since the last line
+                // and we are not currently limiting, reset the count.
+                count = 0;
             }
+
             if (alwaysUpdateTime || overTime) {
                 lastItemTime = System.currentTimeMillis();
             }