Java 7 conversions

Change-Id: Id834157281c02302bfe6f71201042712144b22ff
Reviewed-on: http://gerrit.dmdirc.com/2894
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

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

@@ -35,7 +35,7 @@ import java.util.Map;
 public abstract class BaseChannelClientInfo implements ChannelClientInfo {
 
     /** A map for random data associated with the client to be stored in. */
-    private final Map<Object, Object> map = new HashMap<Object, Object>();
+    private final Map<Object, Object> map = new HashMap<>();
 
     /** The channel that the client is associated with. */
     private final ChannelInfo channel;

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

@@ -39,10 +39,10 @@ public abstract class BaseChannelInfo implements ChannelInfo {
     private final Parser parser;
 
     /** A map for random data associated with the client to be stored in. */
-    private final Map<Object, Object> map = new HashMap<Object, Object>();
+    private final Map<Object, Object> map = new HashMap<>();
 
     /** The clients in this channel. */
-    private final Map<String, ChannelClientInfo> clients = new HashMap<String, ChannelClientInfo>();
+    private final Map<String, ChannelClientInfo> clients = new HashMap<>();
 
     /** The name of this channel. */
     private final String name;

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

@@ -37,7 +37,7 @@ public abstract class BaseClientInfo implements ClientInfo {
     private final Parser parser;
 
     /** A map for random data associated with the client to be stored in. */
-    private final Map<Object, Object> map = new HashMap<Object, Object>();
+    private final Map<Object, Object> map = new HashMap<>();
 
     /** The user's details. */
     private String nick, user, host, realname, account = null;

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

@@ -110,7 +110,7 @@ public class CallbackManager {
 
     /** Hashtable used to store the different types of callback known. */
     private final Map<Class<? extends CallbackInterface>, CallbackObject> callbackHash
-            = new HashMap<Class<? extends CallbackInterface>, CallbackObject>();
+            = new HashMap<>();
 
     /** A map of implementations to use for parser interfaces. */
     private final Map<Class<?>, Class<?>> implementationMap;

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

@@ -19,7 +19,6 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-
 package com.dmdirc.parser.common;
 
 import com.dmdirc.parser.interfaces.FakableArgument;
@@ -47,8 +46,8 @@ public class CallbackObject {
     protected final Class<? extends CallbackInterface> type;
 
     /** Arraylist for storing callback information related to the callback. */
-    protected final List<CallbackInterface> callbackInfo =
-            new CopyOnWriteArrayList<CallbackInterface>();
+    protected final List<CallbackInterface> callbackInfo
+            = new CopyOnWriteArrayList<>();
 
     /** Reference to the Parser that owns this callback. */
     protected Parser myParser;
@@ -168,7 +167,8 @@ public class CallbackObject {
         for (CallbackInterface iface : callbackInfo) {
             try {
                 type.getMethods()[0].invoke(iface, newArgs);
-            } catch (Exception e) {
+            } catch (SecurityException | IllegalAccessException |
+                    IllegalArgumentException | InvocationTargetException e) {
                 if (getType().equals(ErrorInfoListener.class)) {
                     System.out.printf("Exception in onError Callback. [%s]\n", e.getMessage());
                     e.printStackTrace();
@@ -187,10 +187,10 @@ public class CallbackObject {
     }
 
     /**
-     * Replaces all null entries in the specified array with fake values,
-     * if the corresponding parameter of this callback's type is marked with
-     * the {@link FakableArgument} annotation. The fake classes are constructed
-     * by using parameters designated {@link FakableSource}.
+     * Replaces all null entries in the specified array with fake values, if the
+     * corresponding parameter of this callback's type is marked with the
+     * {@link FakableArgument} annotation. The fake classes are constructed by
+     * using parameters designated {@link FakableSource}.
      *
      * @param args The arguments to be faked
      */
@@ -217,15 +217,15 @@ public class CallbackObject {
      * infinite recursion in cases of cyclic dependencies. If recursion fails,
      * the constructor is skipped.
      *
-     * If the created object has a <code>setFake(boolean)</code> method, it
-     * is automatically invoked with an argument of <code>true</code>.
+     * If the created object has a <code>setFake(boolean)</code> method, it is
+     * automatically invoked with an argument of <code>true</code>.
      *
      * @param args The arguments array to use for sources
      * @param target The class that should be constructed
      * @return An instance of the target class, or null on failure
      */
     protected Object getFakeArg(final Object[] args, final Class<?> target) {
-        final Map<Class<?>, Object> sources = new HashMap<Class<?>, Object>();
+        final Map<Class<?>, Object> sources = new HashMap<>();
         int i = 0;
 
         for (Annotation[] anns : type.getMethods()[0].getParameterAnnotations()) {
@@ -285,13 +285,8 @@ public class CallbackObject {
                     }
 
                     return instance;
-                } catch (InstantiationException ex) {
-                    // Do nothing
-                } catch (IllegalAccessException ex) {
-                    // Do nothing
-                } catch (IllegalArgumentException ex) {
-                    // Do nothing
-                } catch (InvocationTargetException ex) {
+                } catch (InstantiationException | IllegalAccessException |
+                        IllegalArgumentException | InvocationTargetException ex) {
                     // Do nothing
                 }
             }
@@ -301,12 +296,12 @@ public class CallbackObject {
     }
 
     /**
-     * Returns the concrete class which should be instansiated if this
-     * callback object desires an instance of the specified type. Generally,
-     * this will translate the common interfaces to specific parser-dependent
+     * Returns the concrete class which should be instantiated if this callback
+     * object desires an instance of the specified type. Generally, this will
+     * translate the common interfaces to specific parser-dependent
      * implementations.
      *
-     * @param type The type to be instansiated
+     * @param type The type to be instantiated
      * @return A concrete implementation of that type
      */
     protected Class<?> getImplementation(final Class<?> type) {

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

@@ -39,7 +39,7 @@ public class CallbackObjectSpecific extends CallbackObject {
 
     /** Hashtable for storing specific information for callback. */
     protected final Map<CallbackInterface, String> specificData
-            = new HashMap<CallbackInterface, String>();
+            = new HashMap<>();
 
     /**
      * Create a new instance of the Callback Object.
@@ -147,7 +147,7 @@ public class CallbackObjectSpecific extends CallbackObject {
 
         createFakeArgs(newArgs);
 
-        for (CallbackInterface iface : new ArrayList<CallbackInterface>(callbackInfo)) {
+        for (CallbackInterface iface : new ArrayList<>(callbackInfo)) {
             if (type.isAnnotationPresent(SpecificCallback.class)
                     && ((args[0] instanceof ClientInfo
                     && !isValidUser(iface, ((ClientInfo) args[0]).getHostname()))
@@ -162,7 +162,7 @@ public class CallbackObjectSpecific extends CallbackObject {
 
             try {
                 type.getMethods()[0].invoke(iface, newArgs);
-            } catch (Exception e) {
+            } catch (ReflectiveOperationException e) {
                 final ParserError ei = new ParserError(ParserError.ERROR_ERROR,
                         "Exception in callback (" + e.getMessage() + ")",
                         myParser.getLastLine());

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

@@ -28,13 +28,11 @@ import java.util.regex.PatternSyntaxException;
 
 /**
  * Parser Ignore list.
- *
- * @author Shane Mc Cormack
  */
 public class IgnoreList {
 
     /** Arraylist storing ignore patterns. */
-    protected final List<String> ignoreInfo = new ArrayList<String>();
+    protected final List<String> ignoreInfo = new ArrayList<>();
 
     /**
      * Creates a new instance of RegexStringList.
@@ -193,7 +191,7 @@ public class IgnoreList {
      * @return All expressions in this ignore list
      */
     public List<String> getRegexList() {
-        return new ArrayList<String>(ignoreInfo);
+        return new ArrayList<>(ignoreInfo);
     }
 
     /**
@@ -203,7 +201,7 @@ public class IgnoreList {
      * @throws UnsupportedOperationException if an expression can't be converted
      */
     public List<String> getSimpleList() throws UnsupportedOperationException {
-        final List<String> res = new ArrayList<String>();
+        final List<String> res = new ArrayList<>();
 
         for (String regex : ignoreInfo) {
             res.add(regexToSimple(regex));

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

@@ -46,9 +46,9 @@ public final class IRCAuthenticator extends Authenticator {
     /** Singleton instance of IRCAuthenticator. */
     private static IRCAuthenticator me;
     /** List of authentication replies. */
-    private final Map<String, PasswordAuthentication> replies = new HashMap<String, PasswordAuthentication>();
+    private final Map<String, PasswordAuthentication> replies = new HashMap<>();
     /** List of servers for each host. */
-    private final Map<String, List<URI>> owners = new HashMap<String, List<URI>>();
+    private final Map<String, List<URI>> owners = new HashMap<>();
     /** Semaphore for connection limiting. */
     private final Semaphore mySemaphore = new Semaphore(1, true);
 

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

@@ -54,7 +54,7 @@ public class IRCChannelClientInfo implements ChannelClientInfo {
      * @param channel Channel that owns this channelclient
      */
     public IRCChannelClientInfo(final IRCParser tParser, final IRCClientInfo client, final ChannelInfo channel) {
-        myMap = new HashMap<Object, Object>();
+        myMap = new HashMap<>();
         myParser = tParser;
         cClient = client;
         myChannel = channel;

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

@@ -69,20 +69,20 @@ public class IRCChannelInfo implements ChannelInfo {
     /** Hashtable containing references to ChannelClients. */
     private final Map<String, IRCChannelClientInfo> clients = Collections.synchronizedMap(new HashMap<String, IRCChannelClientInfo>());
     /** Hashtable storing values for modes set in the channel that use parameters. */
-    private final Map<Character, String> paramModes = new HashMap<Character, String>();
+    private final Map<Character, String> paramModes = new HashMap<>();
     /** Hashtable storing list modes. */
-    private final Map<Character, ArrayList<ChannelListModeItem>> listModes = new HashMap<Character, ArrayList<ChannelListModeItem>>();
+    private final Map<Character, ArrayList<ChannelListModeItem>> listModes = new HashMap<>();
     /**
      * LinkedList storing status of mode adding.
      * if an item is in this list for a mode, we are expecting new items for the list
      */
-    private final List<Character> addingModes = new LinkedList<Character>();
+    private final List<Character> addingModes = new LinkedList<>();
     /** Modes waiting to be sent to the server. */
-    private final List<String> modeQueue = new LinkedList<String>();
+    private final List<String> modeQueue = new LinkedList<>();
     /** A Map to allow applications to attach misc data to this object. */
     private final Map<Object, Object> map;
     /** Queue of requested list modes. */
-    private final Queue<Character> listModeQueue = new LinkedList<Character>();
+    private final Queue<Character> listModeQueue = new LinkedList<>();
     /** Listmode Queue Time. */
     private long listModeQueueTime = System.currentTimeMillis();
     /** Have we asked the server for the list modes for this channel yet? */
@@ -97,7 +97,7 @@ public class IRCChannelInfo implements ChannelInfo {
      * @param name Channel name.
      */
     public IRCChannelInfo(final IRCParser parser, final String name) {
-        map = new HashMap<Object, Object>();
+        map = new HashMap<>();
         this.parser = parser;
         this.name = name;
     }
@@ -113,7 +113,7 @@ public class IRCChannelInfo implements ChannelInfo {
         // Incase of breakage, if getListModeQueue() was last called greater than
         // 60 seconds ago, we reset the list.
         if (now - (30 * 1000) > listModeQueueTime) {
-            result = new LinkedList<Character>();
+            result = new LinkedList<>();
             parser.callDebugInfo(IRCParser.DEBUG_LMQ, "Resetting LMQ");
         }
         listModeQueueTime = now;

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

@@ -62,9 +62,9 @@ public class IRCClientInfo implements LocalClientInfo {
     /** A Map to allow applications to attach misc data to this object. */
     private final Map<Object, Object> map;
     /** List of ChannelClientInfos that point to this. */
-    private final Map<String, IRCChannelClientInfo> clients = new HashMap<String, IRCChannelClientInfo>();
+    private final Map<String, IRCChannelClientInfo> clients = new HashMap<>();
     /** Modes waiting to be sent to the server. */
-    private final List<String> modeQueue = new LinkedList<String>();
+    private final List<String> modeQueue = new LinkedList<>();
 
     /**
      * Create a new client object from a hostmask.
@@ -74,7 +74,7 @@ public class IRCClientInfo implements LocalClientInfo {
      * @see IRCClientInfo#parseHost
      */
     public IRCClientInfo(final IRCParser tParser, final String sHostmask) {
-        map = new HashMap<Object, Object>();
+        map = new HashMap<>();
         setUserBits(sHostmask, true);
         parser = tParser;
     }
@@ -393,7 +393,7 @@ public class IRCClientInfo implements LocalClientInfo {
      * @return int with the count of known channels
      */
     public List<IRCChannelClientInfo> getChannelClients() {
-        return new ArrayList<IRCChannelClientInfo>(clients.values());
+        return new ArrayList<>(clients.values());
     }
 
     /** {@inheritDoc} */

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

@@ -1020,10 +1020,7 @@ public class IRCParser extends BaseParser implements SecureParser, EncodingParse
         } catch (IOException e) {
             handleConnectException(e, true);
             return;
-        } catch (NoSuchAlgorithmException e) {
-            handleConnectException(e, false);
-            return;
-        } catch (KeyManagementException e) {
+        } catch (NoSuchAlgorithmException | KeyManagementException e) {
             handleConnectException(e, false);
             return;
         }

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

@@ -19,7 +19,6 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-
 package com.dmdirc.parser.irc;
 
 import com.dmdirc.parser.common.AwayState;
@@ -48,28 +47,33 @@ public class ProcessAway extends IRCProcessor {
      */
     @Override
     public void process(final String sParam, final String[] token) {
-        if ("AWAY".equals(sParam)) {
-            final IRCClientInfo iClient = getClientInfo(token[0]);
-            if (iClient != null) {
-                final AwayState oldState = iClient.getAwayState();
+        final IRCClientInfo iClient = getClientInfo(token[0]);
+        switch (sParam) {
+            case "AWAY":
+                if (iClient != null) {
+                    final AwayState oldState = iClient.getAwayState();
 
-                final String reason = (token.length > 2) ? token[token.length - 1] : "";
-                iClient.setAwayReason(reason);
-                iClient.setAwayState(reason.isEmpty() ? AwayState.HERE : AwayState.AWAY);
+                    final String reason = (token.length > 2) ? token[token.length - 1] : "";
+                    iClient.setAwayReason(reason);
+                    iClient.setAwayState(reason.isEmpty() ? AwayState.HERE : AwayState.AWAY);
 
-                if (iClient == parser.getLocalClient()) {
-                    callAwayState(oldState, iClient.getAwayState(), iClient.getAwayReason());
+                    if (iClient == parser.getLocalClient()) {
+                        callAwayState(oldState, iClient.getAwayState(), iClient.getAwayReason());
+                    }
+                }
+                break;
+            case "301":
+                // WHO Response
+                if (iClient != null) {
+                    iClient.setAwayReason(token[token.length - 1]);
                 }
-            }
-        } else if ("301".equals(sParam)) { // WHO Response
-            final IRCClientInfo iClient = getClientInfo(token[3]);
-            if (iClient != null) {
-                iClient.setAwayReason(token[token.length - 1]);
-            }
-        } else { // IRC HERE/BACK response
-            final AwayState oldState = parser.getLocalClient().getAwayState();
-            parser.getLocalClient().setAwayState("306".equals(sParam) ? AwayState.AWAY : AwayState.HERE);
-            callAwayState(oldState, parser.getLocalClient().getAwayState(), parser.getLocalClient().getAwayReason());
+                break;
+            default:
+                // IRC HERE/BACK response
+                final AwayState oldState = parser.getLocalClient().getAwayState();
+                parser.getLocalClient().setAwayState("306".equals(sParam) ? AwayState.AWAY : AwayState.HERE);
+                callAwayState(oldState, parser.getLocalClient().getAwayState(), parser.getLocalClient().getAwayReason());
+                break;
         }
     }
 

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

@@ -42,7 +42,7 @@ public class ProcessCap extends TimestampedIRCProcessor {
     /** Have we handled the pre-connect cap request? */
     private boolean hasCapped = false;
     /** List of supported capabilities. */
-    private List<String> supportedCapabilities = new ArrayList<String>();
+    private List<String> supportedCapabilities = new ArrayList<>();
 
     /**
      * Create a new instance of the IRCProcessor Object.

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

@@ -52,16 +52,19 @@ public class ProcessList extends IRCProcessor {
         // :port80b.se.quakenet.org 321 MD87 Channel :Users  Name
         // :port80b.se.quakenet.org 322 MD87 #DMDirc 10 :
         // :port80b.se.quakenet.org 323 MD87 :End of /LIST
-
-        if ("321".equals(sParam)) {
-            getCallbackManager().getCallback(GroupListStartListener.class)
-                    .onGroupListStart(null, null);
-        } else if ("322".equals(sParam)) {
-            getCallbackManager().getCallback(GroupListEntryListener.class)
-                    .onGroupListEntry(null, null, token[3], Integer.parseInt(token[4]), token[5]);
-        } else if ("323".equals(sParam)) {
-            getCallbackManager().getCallback(GroupListEndListener.class)
-                    .onGroupListEnd(null, null);
+        switch (sParam) {
+            case "321":
+                getCallbackManager().getCallback(GroupListStartListener.class)
+                        .onGroupListStart(null, null);
+                break;
+            case "322":
+                getCallbackManager().getCallback(GroupListEntryListener.class)
+                        .onGroupListEntry(null, null, token[3], Integer.parseInt(token[4]), token[5]);
+                break;
+            case "323":
+                getCallbackManager().getCallback(GroupListEndListener.class)
+                        .onGroupListEnd(null, null);
+                break;
         }
     }
 

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

@@ -49,12 +49,16 @@ public class ProcessMOTD extends IRCProcessor {
      */
     @Override
     public void process(final String sParam, final String[] token) {
-        if ("375".equals(sParam)) {
-            callMOTDStart(token[token.length - 1]);
-        } else if ("372".equals(sParam)) {
-            callMOTDLine(token[token.length - 1]);
-        } else {
-            callMOTDEnd("422".equals(sParam), token[token.length - 1]);
+        switch (sParam) {
+            case "375":
+                callMOTDStart(token[token.length - 1]);
+                break;
+            case "372":
+                callMOTDLine(token[token.length - 1]);
+                break;
+            default:
+                callMOTDEnd("422".equals(sParam), token[token.length - 1]);
+                break;
         }
     }
 

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

@@ -62,17 +62,20 @@ public class ProcessMode extends IRCProcessor {
     public void process(final String sParam, final String[] token) {
         String[] sModestr;
         String sChannelName;
-        if (sParam.equals("324")) {
-            sChannelName = token[3];
-            sModestr = new String[token.length - 4];
-            System.arraycopy(token, 4, sModestr, 0, token.length - 4);
-        } else if (sParam.equals("221")) {
-            processUserMode(sParam, token, new String[]{token[token.length - 1]}, true);
-            return;
-        } else {
-            sChannelName = token[2];
-            sModestr = new String[token.length - 3];
-            System.arraycopy(token, 3, sModestr, 0, token.length - 3);
+        switch (sParam) {
+            case "324":
+                sChannelName = token[3];
+                sModestr = new String[token.length - 4];
+                System.arraycopy(token, 4, sModestr, 0, token.length - 4);
+                break;
+            case "221":
+                processUserMode(sParam, token, new String[]{token[token.length - 1]}, true);
+                return;
+            default:
+                sChannelName = token[2];
+                sModestr = new String[token.length - 3];
+                System.arraycopy(token, 3, sModestr, 0, token.length - 3);
+                break;
         }
 
         if (isValidChannelName(sChannelName)) {

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

@@ -76,7 +76,7 @@ public class ProcessQuit extends IRCProcessor {
             sReason = token[token.length - 1];
         }
 
-        final List<IRCChannelInfo> channelList = new ArrayList<IRCChannelInfo>(parser.getChannels());
+        final List<IRCChannelInfo> channelList = new ArrayList<>(parser.getChannels());
         for (IRCChannelInfo iChannel : channelList) {
             iChannelClient = iChannel.getChannelClient(iClient);
             if (iChannelClient != null) {

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

@@ -49,44 +49,43 @@ public class ProcessTopic extends IRCProcessor {
     @Override
     public void process(final String sParam, final String[] token) {
         IRCChannelInfo iChannel;
-        if (sParam.equals("332")) {
-            iChannel = getChannel(token[3]);
-            if (iChannel == null) {
-                return;
-            }
-            iChannel.setInternalTopic(token[token.length - 1]);
-        } else if (sParam.equals("333")) {
-            if (token.length > 3) {
+        switch (sParam) {
+            case "332":
                 iChannel = getChannel(token[3]);
                 if (iChannel == null) {
                     return;
-                }
-                if (token.length > 4) {
-                    iChannel.setTopicUser(token[4]);
-                    if (token.length > 5) {
-                        iChannel.setTopicTime(Long.parseLong(token[5]));
+                }   iChannel.setInternalTopic(token[token.length - 1]);
+                break;
+            case "333":
+                if (token.length > 3) {
+                    iChannel = getChannel(token[3]);
+                    if (iChannel == null) {
+                        return;
+                    }
+                    if (token.length > 4) {
+                        iChannel.setTopicUser(token[4]);
+                        if (token.length > 5) {
+                            iChannel.setTopicTime(Long.parseLong(token[5]));
+                        }
+                    }
+                    callChannelTopic(iChannel, true);
+                }   break;
+            default:
+                if (IRCParser.ALWAYS_UPDATECLIENT) {
+                    final IRCClientInfo iClient = getClientInfo(token[0]);
+                    if (iClient != null && iClient.getHostname().isEmpty()) {
+                        iClient.setUserBits(token[0], false);
                     }
-                }
-                callChannelTopic(iChannel, true);
-            }
-        } else {
-            if (IRCParser.ALWAYS_UPDATECLIENT) {
-                final IRCClientInfo iClient = getClientInfo(token[0]);
-                if (iClient != null && iClient.getHostname().isEmpty()) {
-                    iClient.setUserBits(token[0], false);
-                }
-            }
-            iChannel = getChannel(token[2]);
+                }   iChannel = getChannel(token[2]);
             if (iChannel == null) {
                 return;
-            }
-            iChannel.setTopicTime(System.currentTimeMillis() / 1000);
+            }   iChannel.setTopicTime(System.currentTimeMillis() / 1000);
             if (token[0].charAt(0) == ':') {
                 token[0] = token[0].substring(1);
-            }
-            iChannel.setTopicUser(token[0]);
+            }   iChannel.setTopicUser(token[0]);
             iChannel.setInternalTopic(token[token.length - 1]);
-            callChannelTopic(iChannel, false);
+                callChannelTopic(iChannel, false);
+                break;
         }
     }
 

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

@@ -38,7 +38,7 @@ public class ProcessingManager {
     /** Reference to the parser object that owns this ProcessingManager. */
     private final IRCParser parser;
     /** Hashtable used to store the different types of IRCProcessor known. */
-    private final Map<String, IRCProcessor> processHash = new HashMap<String, IRCProcessor>();
+    private final Map<String, IRCProcessor> processHash = new HashMap<>();
 
     /**
      * Constructor to create a ProcessingManager.

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

@@ -39,7 +39,7 @@ public class OutputQueue {
     /** Is queueing enabled? */
     private boolean queueEnabled = true;
     /** The output queue! */
-    private final BlockingQueue<QueueItem> queue = new PriorityBlockingQueue<QueueItem>();
+    private final BlockingQueue<QueueItem> queue = new PriorityBlockingQueue<>();
     /** Object for synchronising access to the {@link #queueHandler}. */
     private final Object queueHandlerLock = new Object();
     /** Thread for the sending queue. */

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

@@ -40,7 +40,7 @@ import java.util.Timer;
 })
 public class TestParser extends IRCParser implements Parser {
 
-    public final List<String> sentLines = new ArrayList<String>();
+    public final List<String> sentLines = new ArrayList<>();
 
     public String nick = "nick";
 

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

@@ -115,7 +115,7 @@ public class IgnoreListTest {
     @Test
     public void testGetSimpleList() throws UnsupportedOperationException {
         final IgnoreList list = new IgnoreList();
-        final List<String> items = new ArrayList<String>();
+        final List<String> items = new ArrayList<>();
         
         for (String[] test : tests) {
             items.add(test[0]);

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

@@ -69,8 +69,8 @@ public class ChannelClientInfoTest {
 
         parser.injectConnectionStrings();
         parser.injectLine(":nick JOIN #DMDirc_testing");
-        final Map<Object, Object> map1 = new HashMap<Object, Object>();
-        final Map<Object, Object> map2 = new HashMap<Object, Object>();
+        final Map<Object, Object> map1 = new HashMap<>();
+        final Map<Object, Object> map2 = new HashMap<>();
         
         final IRCChannelClientInfo cci = parser.getClient("nick").getChannelClients().get(0);
         

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

@@ -42,7 +42,7 @@ public class RegexStringListTest {
 
     @Test
     public void testAddAll() {
-        final List<String> tempList = new ArrayList<String>();
+        final List<String> tempList = new ArrayList<>();
         tempList.add("a!b@c");
         tempList.add("a!b@c");
         tempList.add("A!B@C");
@@ -57,7 +57,7 @@ public class RegexStringListTest {
 
     @Test
     public void testRmove() {
-        final List<String> tempList = new ArrayList<String>();
+        final List<String> tempList = new ArrayList<>();
         tempList.add("a!b@c");
         tempList.add("Data.*");
 
@@ -71,7 +71,7 @@ public class RegexStringListTest {
 
     @Test
     public void testClear() {
-        final List<String> tempList = new ArrayList<String>();
+        final List<String> tempList = new ArrayList<>();
         tempList.add("a!b@c");
         tempList.add("Data.*");
 
@@ -83,7 +83,7 @@ public class RegexStringListTest {
 
     @Test
     public void testMatches() {
-        final List<String> tempList = new ArrayList<String>();
+        final List<String> tempList = new ArrayList<>();
         tempList.add("a!b@c");
         tempList.add("Data.*");