Java 7 conversions

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

src/com/dmdirc/addons/audio/AudioPlayer.java

@@ -101,9 +101,7 @@ public final class AudioPlayer implements Runnable {
         try {
             AudioSystem.getAudioInputStream(file);
             type = AudioType.WAV;
-        } catch (UnsupportedAudioFileException e) {
-            type = AudioType.INVALID;
-        } catch (IOException e) {
+        } catch (UnsupportedAudioFileException | IOException e) {
             type = AudioType.INVALID;
         }
         return type;

src/com/dmdirc/addons/calc/Lexer.java

@@ -52,7 +52,7 @@ public class Lexer {
      * @throws ParseException If an expected token is not found
      */
     public List<Token> tokenise() throws ParseException {
-        final List<Token> res = new ArrayList<Token>();
+        final List<Token> res = new ArrayList<>();
         List<TokenType> possibles = Arrays.asList(TokenType.values());
 
         boolean cont = true;

src/com/dmdirc/addons/calc/Parser.java

@@ -45,7 +45,7 @@ public class Parser {
     protected final Lexer lexer;
 
     static {
-        TOKENS_BY_PRECEDENCE = new ArrayList<TokenType>(Arrays.asList(
+        TOKENS_BY_PRECEDENCE = new ArrayList<>(Arrays.asList(
                 TokenType.values()));
         Collections.sort(TOKENS_BY_PRECEDENCE,
                 new TokenTypePrecedenceComparator());
@@ -61,7 +61,7 @@ public class Parser {
      * formula such as one involving a mis-matched bracket).
      */
     public TreeToken parse() throws ParseException {
-        final List<TreeToken> tokens = new ArrayList<TreeToken>();
+        final List<TreeToken> tokens = new ArrayList<>();
 
         for (Token token : lexer.tokenise()) {
             tokens.add(new TreeToken(token));
@@ -138,7 +138,7 @@ public class Parser {
      */
     protected void parseBracket(final List<TreeToken> tokens, final int offset)
             throws ParseException {
-        final List<TreeToken> stack = new ArrayList<TreeToken>();
+        final List<TreeToken> stack = new ArrayList<>();
 
         for (int i = offset - 1; i > 0; i--) {
             if (tokens.get(i).getToken().getType() == TokenType.BRACKET_OPEN

src/com/dmdirc/addons/calc/TokenType.java

@@ -184,7 +184,7 @@ public enum TokenType {
      */
     public synchronized List<TokenType> getFollowers() {
         if (follows == null) {
-            follows = new ArrayList<TokenType>();
+            follows = new ArrayList<>();
 
             for (int i = 0; i < strfollows.length; i++) {
                 follows.addAll(searchValueOf(strfollows[i]));
@@ -230,7 +230,7 @@ public enum TokenType {
      * @return A list of matching tokens
      */
     protected static List<TokenType> searchValueOf(final String name) {
-        final List<TokenType> res = new ArrayList<TokenType>();
+        final List<TokenType> res = new ArrayList<>();
 
         for (TokenType token : values()) {
             if ((name.endsWith("*") && token.name().startsWith(name.substring(0,

src/com/dmdirc/addons/calc/TreeToken.java

@@ -39,7 +39,7 @@ public class TreeToken {
 
     /** The children of this node. */
     @Getter
-    private final List<TreeToken> children = new ArrayList<TreeToken>();
+    private final List<TreeToken> children = new ArrayList<>();
 
     /** The token at the root of the tree. */
     @Getter

src/com/dmdirc/addons/dcc/io/DCC.java

@@ -124,9 +124,7 @@ public abstract class DCC implements Runnable {
                 serverSocket = new ServerSocket(i, 1);
                 // Found a socket we can use!
                 break;
-            } catch (IOException ioe) {
-                // Try next socket.
-            } catch (SecurityException se) {
+            } catch (IOException | SecurityException ioe) {
                 // Try next socket.
             } finally {
                 serverSocketSem.release();

src/com/dmdirc/addons/dcc/io/DCCTransfer.java

@@ -43,7 +43,7 @@ import java.util.List;
 public class DCCTransfer extends DCC {
 
     /** List of active sends. */
-    private static final List<DCCTransfer> TRANSFERS = new ArrayList<DCCTransfer>();
+    private static final List<DCCTransfer> TRANSFERS = new ArrayList<>();
 
     /** File Transfer Types. */
     public enum TransferType {
@@ -133,7 +133,7 @@ public class DCCTransfer extends DCC {
      */
     public static List<DCCTransfer> getTransfers() {
         synchronized (TRANSFERS) {
-            return new ArrayList<DCCTransfer>(TRANSFERS);
+            return new ArrayList<>(TRANSFERS);
         }
     }
 
@@ -156,11 +156,8 @@ public class DCCTransfer extends DCC {
         if (transferType == TransferType.SEND) {
             transferFile = new File(filename);
             try {
-                fileIn = new DataInputStream(new FileInputStream(
-                        transferFile.getAbsolutePath()));
-            } catch (FileNotFoundException e) {
-                fileIn = null;
-            } catch (SecurityException e) {
+                fileIn = new DataInputStream(new FileInputStream(transferFile.getAbsolutePath()));
+            } catch (FileNotFoundException | SecurityException e) {
                 fileIn = null;
             }
         }

src/com/dmdirc/addons/dcc/kde/KFileChooser.java

@@ -28,6 +28,7 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import java.awt.Component;
 import java.awt.HeadlessException;
 import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -295,7 +296,7 @@ public class KFileChooser extends JFileChooser {
         try {
             kdp = new KDialogProcess(params.toArray(new String[params.size()]));
             kdp.waitFor();
-        } catch (Exception e) {
+        } catch (IOException | InterruptedException e) {
             return JFileChooser.ERROR_OPTION;
         }
 
@@ -344,7 +345,7 @@ public class KFileChooser extends JFileChooser {
         try {
             kdp = new KDialogProcess(params.toArray(new String[params.size()]));
             kdp.waitFor();
-        } catch (Exception e) {
+        } catch (IOException | InterruptedException e) {
             return JFileChooser.ERROR_OPTION;
         }
 

src/com/dmdirc/addons/dcop/DcopPlugin.java

@@ -53,7 +53,7 @@ public final class DcopPlugin extends BaseCommandPlugin {
      * @return The output of the specified command
      */
     public static List<String> getDcopResult(final String command) {
-        final ArrayList<String> result = new ArrayList<String>();
+        final ArrayList<String> result = new ArrayList<>();
 
         InputStreamReader reader;
         BufferedReader input;

src/com/dmdirc/addons/debug/commands/ConfigStats.java

@@ -118,8 +118,7 @@ public class ConfigStats extends DebugCommand {
             }
         }
         if (!found) {
-            sendLine(origin, isSilent, FORMAT_ERROR,
-                    "Unable to locate option.");
+            sendLine(origin, isSilent, FORMAT_ERROR, "Unable to locate option.");
         }
     }
 
@@ -140,8 +139,7 @@ public class ConfigStats extends DebugCommand {
                 break;
             }
             i++;
-            sendLine(origin, isSilent, FORMAT_OUTPUT,
-                    entry.getKey() + " - " + entry.getValue());
+            sendLine(origin, isSilent, FORMAT_OUTPUT, entry.getKey() + " - " + entry.getValue());
         }
     }
 
@@ -160,8 +158,7 @@ public class ConfigStats extends DebugCommand {
             if (entry.getValue() <= cutoff) {
                 break;
             }
-            sendLine(origin, isSilent, FORMAT_OUTPUT,
-                    entry.getKey() + " - " + entry.getValue());
+            sendLine(origin, isSilent, FORMAT_OUTPUT, entry.getKey() + " - " + entry.getValue());
         }
     }
 
@@ -172,15 +169,13 @@ public class ConfigStats extends DebugCommand {
      * @return Sorted set of config options and usages
      */
     private static SortedSet<Entry<String, Integer>> getSortedStats() {
-        final SortedSet<Entry<String, Integer>> sortedStats =
-                new TreeSet<Entry<String, Integer>>(new ValueComparator());
+        final SortedSet<Entry<String, Integer>> sortedStats = new TreeSet<>(new ValueComparator());
         sortedStats.addAll(ConfigManager.getStats().entrySet());
         return sortedStats;
     }
 
     /** Reverse value comparator for a map entry. */
-    private static class ValueComparator implements
-            Comparator<Entry<String, Integer>>, Serializable {
+    private static class ValueComparator implements Comparator<Entry<String, Integer>>, Serializable {
 
         /**
          * A version number for this class. It should be changed whenever the
@@ -191,8 +186,7 @@ public class ConfigStats extends DebugCommand {
 
         /** {@inheritDoc} */
         @Override
-        public int compare(final Entry<String, Integer> o1,
-                final Entry<String, Integer> o2) {
+        public int compare(final Entry<String, Integer> o1, final Entry<String, Integer> o2) {
             int returnValue = o1.getValue().compareTo(o2.getValue()) * -1;
 
             if (returnValue == 0) {

src/com/dmdirc/addons/debug/commands/Error.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.addons.debug.commands;
 
 import com.dmdirc.FrameContainer;
@@ -38,9 +37,6 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
  */
 public class Error extends DebugCommand implements IntelligentCommand {
 
-    /** Error level to create. */
-    private ErrorLevel el = ErrorLevel.HIGH;
-
     /**
      * Creates a new instance of the command.
      *
@@ -51,33 +47,38 @@ public class Error extends DebugCommand implements IntelligentCommand {
         super(plugin, command);
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public String getName() {
         return "error";
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public String getUsage() {
         return "<user|app> [<low|medium|high|fatal|unknown>] - Creates an error"
                 + " with the specified parameters, defaults to high priority.";
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         if ((args.getArguments().length == 1
                 || args.getArguments().length == 2)
                 && args.getArguments()[0].equals("user")) {
-            Logger.userError(getLevel(args.getArguments()),
-                    "Debug error message");
+            Logger.userError(getLevel(args.getArguments()), "Debug error message");
         } else if ((args.getArguments().length == 1
                 || args.getArguments().length == 2)
                 && args.getArguments()[0].equals("app")) {
-            Logger.appError(getLevel(args.getArguments()),
-                    "Debug error message", new IllegalArgumentException());
+            Logger.appError(getLevel(args.getArguments()), "Debug error message",
+                    new IllegalArgumentException());
         } else {
             showUsage(origin, args.isSilent(), getName(), getUsage());
         }
@@ -92,25 +93,19 @@ public class Error extends DebugCommand implements IntelligentCommand {
      */
     private ErrorLevel getLevel(final String... args) {
         if (args.length >= 2) {
-            final String level = args[1];
-            if ("low".equals(level)) {
-                el = ErrorLevel.LOW;
-            } else if ("medium".equals(level)) {
-                el = ErrorLevel.MEDIUM;
-            } else if ("fatal".equals(level)) {
-                el = ErrorLevel.FATAL;
-            } else if ("unknown".equals(level)) {
-                el = ErrorLevel.UNKNOWN;
-            } else {
-                el = ErrorLevel.HIGH;
+            try {
+                return ErrorLevel.valueOf(args[1].toUpperCase());
+            } catch (IllegalArgumentException ex) {
+                return ErrorLevel.HIGH;
             }
         } else {
-            el = ErrorLevel.HIGH;
+            return ErrorLevel.HIGH;
         }
-        return el;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {

src/com/dmdirc/addons/debug/commands/FakeUpdates.java

@@ -95,8 +95,7 @@ public class FakeUpdates extends DebugCommand {
         @Override
         public Map<UpdateComponent, UpdateCheckResult> checkForUpdates(
                 final Collection<UpdateComponent> components) {
-            final Map<UpdateComponent, UpdateCheckResult> res
-                    = new HashMap<UpdateComponent, UpdateCheckResult>();
+            final Map<UpdateComponent, UpdateCheckResult> res = new HashMap<>();
 
             for (UpdateComponent component : components) {
                 if (Math.random() * components.size() < 10) {

src/com/dmdirc/addons/dns/DNSPlugin.java

@@ -54,7 +54,7 @@ public final class DNSPlugin extends BaseCommandPlugin {
      * @return Resolved IP(s)
      */
     public static String getIPs(final String hostname) {
-        List<String> results = new ArrayList<String>();
+        List<String> results = new ArrayList<>();
 
         try {
             final InetAddress[] ips = InetAddress.getAllByName(hostname);
@@ -64,7 +64,7 @@ public final class DNSPlugin extends BaseCommandPlugin {
             }
 
         } catch (UnknownHostException ex) {
-            results = new ArrayList<String>();
+            results = new ArrayList<>();
         }
 
         return results.toString();

src/com/dmdirc/addons/identd/IdentdServer.java

@@ -44,7 +44,7 @@ public final class IdentdServer implements Runnable {
     private ServerSocket serverSocket;
 
     /** Arraylist of all the clients we have */
-    private final List<IdentClient> clientList = new ArrayList<IdentClient>();
+    private final List<IdentClient> clientList = new ArrayList<>();
 
     /** The plugin that owns us. */
     private final IdentdPlugin myPlugin;

src/com/dmdirc/addons/lagdisplay/PingHistoryPanel.java

@@ -102,7 +102,7 @@ public class PingHistoryPanel extends JPanel {
 
         long last1 = -1, last2 = -1;
         final List<Long> list = history.getList();
-        final List<Rectangle> rects = new ArrayList<Rectangle>();
+        final List<Rectangle> rects = new ArrayList<>();
 
         for (int i = 0; i < list.size(); i++) {
             final Long value = list.get(i);

src/com/dmdirc/addons/mediasource_dbus/DBusMediaSource.java

@@ -46,14 +46,14 @@ public class DBusMediaSource extends BasePlugin implements MediaSourceManager {
     private List<MediaSource> sources;
     /** A map of discovered mpris sources. */
     private final Map<String, MediaSource> mprisSources
-            = new HashMap<String, MediaSource>();
+            = new HashMap<>();
     /** The path to qdbus. */
     private String qdbus;
 
     /** {@inheritDoc} */
     @Override
     public void onLoad() {
-        sources = new ArrayList<MediaSource>();
+        sources = new ArrayList<>();
 
         if (new File("/usr/bin/qdbus").exists()) {
             qdbus = "/usr/bin/qdbus";
@@ -118,7 +118,7 @@ public class DBusMediaSource extends BasePlugin implements MediaSourceManager {
      * @return The output of the specified command
      */
     protected static List<String> getInfo(final String[] args) {
-        final ArrayList<String> result = new ArrayList<String>();
+        final ArrayList<String> result = new ArrayList<>();
 
         InputStreamReader reader;
         BufferedReader input;
@@ -154,7 +154,7 @@ public class DBusMediaSource extends BasePlugin implements MediaSourceManager {
      */
     protected static Map<String, String> parseDictionary(
             final List<String> lines) {
-        final Map<String, String> res = new HashMap<String, String>();
+        final Map<String, String> res = new HashMap<>();
 
         for (String line : lines) {
             final int index = line.indexOf(':', line.indexOf(':') + 1);

src/com/dmdirc/addons/mediasource_linux_title/TitleMediaSourcePlugin.java

@@ -41,7 +41,7 @@ public class TitleMediaSourcePlugin extends BasePlugin implements MediaSourceMan
     /** {@inheritDoc} */
     @Override
     public void onLoad() {
-        sources = new ArrayList<MediaSource>(2);
+        sources = new ArrayList<>(2);
         sources.add(new TitleMediaSource("grep -E '\\(\"last\\.?fm\" \"Last\\.?fm\"\\)'" +
                     "| grep -vE '(\"Last.fm " +
                     "Options\"|\"Diagnostics\"|\"last\\.?fm\"|\"Share\"|\\(has no " +

src/com/dmdirc/addons/mediasource_mplayer/MplayerMediaSourcePlugin.java

@@ -102,7 +102,7 @@ public class MplayerMediaSourcePlugin extends BasePlugin implements MediaSource
      * @return Information about the currently playing track
      */
     public static List<String> getInfo() {
-        final ArrayList<String> result = new ArrayList<String>();
+        final ArrayList<String> result = new ArrayList<>();
 
         InputStreamReader reader;
         BufferedReader input;

src/com/dmdirc/addons/mediasource_windows/WindowsMediaSourcePlugin.java

@@ -54,7 +54,7 @@ public class WindowsMediaSourcePlugin extends BasePlugin
     public WindowsMediaSourcePlugin(final PluginInfo pluginInfo) {
         super();
         this.filesHelper = new PluginFilesHelper(pluginInfo);
-        sources = new ArrayList<MediaSource>();
+        sources = new ArrayList<>();
         sources.add(new DllSource(this, "Winamp", true));
         sources.add(new DllSource(this, "iTunes", false));
     }
@@ -87,8 +87,7 @@ public class WindowsMediaSourcePlugin extends BasePlugin
             }
 
             return new MediaInfoOutput(myProcess.exitValue(), data.toString());
-        } catch (SecurityException e) {
-        } catch (IOException e) {
+        } catch (SecurityException | IOException e) {
         }
 
         return new MediaInfoOutput(-1, "Error executing GetMediaInfo.exe");

src/com/dmdirc/addons/nickcolours/NickColourPanel.java

@@ -59,8 +59,7 @@ public class NickColourPanel extends JPanel implements ActionListener,
     private static final long serialVersionUID = 1;
 
     /** The table headings. */
-    private static final String[] HEADERS =
-            {"Network", "Nickname", "Text colour", "Nicklist colour"};
+    private static final String[] HEADERS = {"Network", "Nickname", "Text colour", "Nicklist colour"};
 
     /** The table used for displaying the options. */
     private final JTable table;
@@ -127,8 +126,7 @@ public class NickColourPanel extends JPanel implements ActionListener,
         table.setFillsViewportHeight(true);
         table.setDefaultRenderer(Color.class, new ColourRenderer(colourManager));
 
-        setLayout(new MigLayout("ins 0, fillx, hmax "
-                + controller.getPrefsDialog().getPanelHeight()));
+        setLayout(new MigLayout("ins 0, fillx, hmax " + controller.getPrefsDialog().getPanelHeight()));
         add(scrollPane, "grow, push, wrap, spanx");
 
         final JButton addButton = new JButton("Add");
@@ -163,35 +161,31 @@ public class NickColourPanel extends JPanel implements ActionListener,
      */
     @Override
     public void actionPerformed(final ActionEvent e) {
-        if (e.getActionCommand().equals("Add")) {
-            new NickColourInputDialog(swingController, this);
-        } else if (e.getActionCommand().equals("Edit")) {
-            final DefaultTableModel model
-                    = ((DefaultTableModel) table.getModel());
-            final int row = table.getSelectedRow();
-
-            final String network = (String) model.getValueAt(row, 0);
-            final String nickname = (String) model.getValueAt(row, 1);
-
-            String textcolour = (String) model.getValueAt(row, 2);
-            String nickcolour = (String) model.getValueAt(row, 3);
-
-            if (textcolour == null) {
-                textcolour = "";
-            }
-
-            if (nickcolour == null) {
-                nickcolour = "";
-            }
-
-            new NickColourInputDialog(swingController, this, row, nickname, network, textcolour,
-                    nickcolour);
-        } else if (e.getActionCommand().equals("Delete")) {
-            final int row = table.getSelectedRow();
-
-            if (row > -1) {
-                ((DefaultTableModel) table.getModel()).removeRow(row);
-            }
+        final int row = table.getSelectedRow();
+        switch (e.getActionCommand()) {
+            case "Add":
+                new NickColourInputDialog(swingController, this);
+                break;
+            case "Edit":
+                final DefaultTableModel model = ((DefaultTableModel) table.getModel());
+                final String network = (String) model.getValueAt(row, 0);
+                final String nickname = (String) model.getValueAt(row, 1);
+                String textcolour = (String) model.getValueAt(row, 2);
+                String nickcolour = (String) model.getValueAt(row, 3);
+                if (textcolour == null) {
+                    textcolour = "";
+                }
+                if (nickcolour == null) {
+                    nickcolour = "";
+                }
+                new NickColourInputDialog(swingController, this, row, nickname, network,
+                        textcolour, nickcolour);
+                break;
+            case "Delete":
+                if (row > -1) {
+                    ((DefaultTableModel) table.getModel()).removeRow(row);
+                }
+                break;
         }
     }
 

src/com/dmdirc/addons/nma/NotifyMyAndroidClient.java

@@ -72,7 +72,7 @@ public class NotifyMyAndroidClient {
      * @throws IOException If the NMA service couldn't be reached
      */
     public void notify(final String event, final String description) throws IOException {
-        final Map<String, String> arguments = new HashMap<String, String>();
+        final Map<String, String> arguments = new HashMap<>();
         arguments.put("apikey", getApiKeys());
         arguments.put("application", application);
         arguments.put("event", event);

src/com/dmdirc/addons/notifications/NotificationConfig.java

@@ -67,9 +67,9 @@ public class NotificationConfig extends JPanel implements PreferencesInterface {
         super();
 
         if (methods == null) {
-            this.methods = new LinkedList<String>();
+            this.methods = new LinkedList<>();
         } else {
-            this.methods = new LinkedList<String>(methods);
+            this.methods = new LinkedList<>(methods);
         }
         this.plugin = plugin;
 
@@ -115,7 +115,7 @@ public class NotificationConfig extends JPanel implements PreferencesInterface {
      * @return An ordered list of methods
      */
     public List<String> getMethods() {
-        final List<String> newMethods = new LinkedList<String>();
+        final List<String> newMethods = new LinkedList<>();
 
         final Enumeration<?> values = list.getModel().elements();
 

src/com/dmdirc/addons/nowplaying/NowPlayingSubsitutionPanel.java

@@ -67,7 +67,7 @@ public class NowPlayingSubsitutionPanel extends SubstitutionsPanel<List<String>>
             /** {@inheritDoc} */
             @Override
             public void run() {
-                substitutions = new ArrayList<SubstitutionLabel>();
+                substitutions = new ArrayList<>();
 
                 if (type != null) {
                     for (String sub : type) {

src/com/dmdirc/addons/parser_msn/MSNListener.java

@@ -76,8 +76,7 @@ public class MSNListener extends MsnAdapter {
 
     /** {@inheritDoc} */
     @Override
-    public void contactAddCompleted(final MsnMessenger mm, final MsnContact mc,
-            final MsnList ml) {
+    public void contactAddCompleted(final MsnMessenger mm, final MsnContact mc, final MsnList ml) {
         parser.addClient(mc);
         parser.addClients(parser.getFakeChannel(), Arrays.asList(
                 new ClientInfo[]{ parser.getClient(mc), }));
@@ -86,9 +85,8 @@ public class MSNListener extends MsnAdapter {
     /** {@inheritDoc} */
     @Override
     public void contactListSyncCompleted(final MsnMessenger mm) {
-        final Collection<MsnContact> contacts = Arrays.asList(
-                mm.getContactList().getContacts());
-        final List<ClientInfo> clients = new ArrayList<ClientInfo>();
+        final Collection<MsnContact> contacts = Arrays.asList(mm.getContactList().getContacts());
+        final List<ClientInfo> clients = new ArrayList<>();
         for (MsnContact contact : contacts) {
             parser.addClient(contact);
             clients.add(parser.getClient(contact));
@@ -97,8 +95,7 @@ public class MSNListener extends MsnAdapter {
 
     /** {@inheritDoc} */
     @Override
-    public void contactStatusChanged(final MsnMessenger mm,
-            final MsnContact mc) {
+    public void contactStatusChanged(final MsnMessenger mm, final MsnContact mc) {
         if (mc.getStatus() != MsnUserStatus.OFFLINE) {
             parser.addClients(parser.getFakeChannel(), Arrays.asList(
                     new ClientInfo[]{ parser.getClient(mc), }));

src/com/dmdirc/addons/parser_msn/MSNParser.java

@@ -56,8 +56,7 @@ public class MSNParser extends BaseParser {
     /** MSN Connection. */
     private MsnMessenger msn;
     /** A cache of known clients. */
-    private final Map<String, MSNClientInfo> clients
-            = new HashMap<String, MSNClientInfo>();
+    private final Map<String, MSNClientInfo> clients = new HashMap<>();
     /** Whether or not to use a channel for contact lists. */
     private final boolean useFakeChannel;
     /** The fake channel to use is useFakeChannel is enabled. */
@@ -130,10 +129,8 @@ public class MSNParser extends BaseParser {
     /** {@inheritDoc} */
     @Override
     public LocalClientInfo getLocalClient() {
-        final String[] parts = parseHostmask(msn.getOwner().getEmail()
-                .getEmailAddress());
-        return new MSNLocalClientInfo(msn.getOwner(), this, parts[0], parts[2],
-                parts[1]);
+        final String[] parts = parseHostmask(msn.getOwner().getEmail().getEmailAddress());
+        return new MSNLocalClientInfo(msn.getOwner(), this, parts[0], parts[2], parts[1]);
     }
 
     /** {@inheritDoc} */
@@ -163,8 +160,7 @@ public class MSNParser extends BaseParser {
 
     /** {@inheritDoc} */
     @Override
-    public void sendRawMessage(final String message,
-            final QueuePriority priority) {
+    public void sendRawMessage(final String message, final QueuePriority priority) {
         //Ignore
     }
 
@@ -188,8 +184,7 @@ public class MSNParser extends BaseParser {
 
     /** {@inheritDoc} */
     @Override
-    public Collection<? extends ChannelJoinRequest> extractChannels(
-            final URI uri) {
+    public Collection<? extends ChannelJoinRequest> extractChannels(final URI uri) {
         return Collections.<ChannelJoinRequest>emptyList();
     }
 
@@ -291,15 +286,13 @@ public class MSNParser extends BaseParser {
 
     /** {@inheritDoc} */
     @Override
-    public void sendCTCP(final String target, final String type,
-            final String message) {
+    public void sendCTCP(final String target, final String type, final String message) {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
     /** {@inheritDoc} */
     @Override
-    public void sendCTCPReply(final String target, final String type,
-            final String message) {
+    public void sendCTCPReply(final String target, final String type, final String message) {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
@@ -361,8 +354,7 @@ public class MSNParser extends BaseParser {
             removeMSNParser();
         }
         final String[] userInfoParts = getURI().getUserInfo().split(":", 2);
-        msn = MsnMessengerFactory.createMsnMessenger(
-                userInfoParts[0], userInfoParts[1]);
+        msn = MsnMessengerFactory.createMsnMessenger(userInfoParts[0], userInfoParts[1]);
         listener = new MSNListener(this);
         msn.addListener(listener);
     }
@@ -383,8 +375,7 @@ public class MSNParser extends BaseParser {
      * @param channel Channel to update
      * @param clients Clients to use in the channel
      */
-    public void updateClients(final ChannelInfo channel,
-            final Collection<ClientInfo> clients) {
+    public void updateClients(final ChannelInfo channel, final Collection<ClientInfo> clients) {
         if (channel == fakeChannel) {
             fakeChannel.replaceContacts(clients);
         }
@@ -396,8 +387,7 @@ public class MSNParser extends BaseParser {
      * @param channel Channel to update
      * @param clients Clients to add in the channel
      */
-    public void addClients(final ChannelInfo channel,
-            final Collection<ClientInfo> clients) {
+    public void addClients(final ChannelInfo channel, final Collection<ClientInfo> clients) {
         if (channel == fakeChannel) {
             fakeChannel.addContacts(clients);
         }
@@ -409,8 +399,7 @@ public class MSNParser extends BaseParser {
      * @param channel Channel to update
      * @param clients Clients to add in the channel
      */
-    public void removeClients(final ChannelInfo channel,
-            final Collection<ClientInfo> clients) {
+    public void removeClients(final ChannelInfo channel, final Collection<ClientInfo> clients) {
         if (channel == fakeChannel) {
             fakeChannel.removeContacts(clients);
         }
@@ -452,8 +441,7 @@ public class MSNParser extends BaseParser {
     public void addClient(final MsnContact contact) {
         final String email = contact.getEmail().getEmailAddress();
         final String[] parts = parseHostmask(email);
-        clients.put(email, new MSNClientInfo(contact, this, parts[0], parts[1],
-                parts[2]));
+        clients.put(email, new MSNClientInfo(contact, this, parts[0], parts[1], parts[2]));
     }
 
     /**

src/com/dmdirc/addons/parser_xmpp/FixedXmppConnection.java

@@ -42,8 +42,7 @@ public class FixedXmppConnection extends XMPPConnection
         implements ConnectionCreationListener {
 
     /** A set of listeners that were registered with the XMPP Parser. */
-    private final Set<ConnectionCreationListener> oldListeners
-            = new HashSet<ConnectionCreationListener>();
+    private final Set<ConnectionCreationListener> oldListeners = new HashSet<>();
 
     /**
      * Creates a new fixed XMPP connection with the specified config.
@@ -109,10 +108,10 @@ public class FixedXmppConnection extends XMPPConnection
             final Field field = XMPPConnection.class.getDeclaredField("connectionEstablishedListeners");
             field.setAccessible(true);
             return (Set<ConnectionCreationListener>) field.get(null);
-        } catch (Exception ex) {
+        } catch (ReflectiveOperationException ex) {
             // Throws a bunch of exceptions... Try to carry on anyway, the
             // horrible concurrency bugs might not bite.
-            return new HashSet<ConnectionCreationListener>();
+            return new HashSet<>();
         }
     }
 

src/com/dmdirc/addons/parser_xmpp/XmppClientInfo.java

@@ -44,8 +44,7 @@ import org.jivesoftware.smack.packet.Presence.Type;
 public class XmppClientInfo extends BaseClientInfo {
 
     /** A map of known endpoints for this client. */
-    private final Map<String, XmppEndpoint> endpoints
-            = new HashMap<String, XmppEndpoint>();
+    private final Map<String, XmppEndpoint> endpoints = new HashMap<>();
 
     /**
      * Creates a new XMPP Client Info object with the specified details.
@@ -55,8 +54,8 @@ public class XmppClientInfo extends BaseClientInfo {
      * @param user The username of the user this object represents
      * @param host The hostname of the user this object represents
      */
-    public XmppClientInfo(final XmppParser parser, final String nick,
-            final String user, final String host) {
+    public XmppClientInfo(final XmppParser parser, final String nick, final String user,
+            final String host) {
         super(parser, nick, user, host);
     }
 
@@ -131,12 +130,11 @@ public class XmppClientInfo extends BaseClientInfo {
      * endpoints, or <code>null</code> if no endpoints are available.
      */
     public Mode getAggregatePresence() {
-        final List<XmppEndpoint> sortedEndpoints
-                = new ArrayList<XmppEndpoint>(endpoints.values());
+        final List<XmppEndpoint> sortedEndpoints = new ArrayList<>(endpoints.values());
         Collections.sort(sortedEndpoints);
 
         // Get the set of the highest priority endpoints
-        final Set<XmppEndpoint> bestEndpoints = new HashSet<XmppEndpoint>(sortedEndpoints.size());
+        final Set<XmppEndpoint> bestEndpoints = new HashSet<>(sortedEndpoints.size());
         int best = 0;
         for (XmppEndpoint endpoint : sortedEndpoints) {
             if (endpoint.getType() != Type.available) {

src/com/dmdirc/addons/parser_xmpp/XmppParser.java

@@ -98,10 +98,10 @@ public class XmppParser extends BaseSocketAwareParser {
     private ChatStateManager stateManager;
 
     /** A cache of known chats. */
-    private final Map<String, Chat> chats = new HashMap<String, Chat>();
+    private final Map<String, Chat> chats = new HashMap<>();
 
     /** A cache of known clients. */
-    private final Map<String, XmppClientInfo> contacts = new HashMap<String, XmppClientInfo>();
+    private final Map<String, XmppClientInfo> contacts = new HashMap<>();
 
     /** Whether or not to use a fake local channel for a buddy list replacement. */
     private final boolean useFakeChannel;

src/com/dmdirc/addons/parserdebug/DebugPlugin.java

@@ -45,8 +45,7 @@ public final class DebugPlugin extends BaseCommandPlugin implements
         DebugInfoListener, ActionListener {
 
     /** Map of parsers registered. */
-    protected final Map<Parser, DebugWindow> registeredParsers
-            = new HashMap<Parser, DebugWindow>();
+    protected final Map<Parser, DebugWindow> registeredParsers = new HashMap<>();
     /** The action controller to use. */
     private final ActionController actionController;
 
@@ -79,7 +78,7 @@ public final class DebugPlugin extends BaseCommandPlugin implements
     public void onUnload() {
         actionController.unregisterListener(this);
 
-        final ArrayList<DebugWindow> windowList = new ArrayList<DebugWindow>();
+        final ArrayList<DebugWindow> windowList = new ArrayList<>();
         for (Parser parser : registeredParsers.keySet()) {
             try {
                 parser.getCallbackManager().delCallback(DebugInfoListener.class, this);

src/com/dmdirc/addons/relaybot/RelayChannelPanel.java

@@ -28,7 +28,6 @@ import com.dmdirc.plugins.Plugin;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
@@ -96,15 +95,12 @@ public class RelayChannelPanel extends JPanel implements ActionListener,
         try {
             final Method getPrefsDialog = controller.getClass()
                     .getDeclaredMethod("getPrefsDialog", (Class<?>) null);
-            final Object prefsDialog = getPrefsDialog.invoke(controller,
-                    (Class<?>) null);
+            final Object prefsDialog = getPrefsDialog.invoke(controller, (Class<?>) null);
             final Method getPanelHeight = prefsDialog.getClass()
                     .getDeclaredMethod("getPanelHeight", (Class<?>) null);
-            final Object panelHeight = getPanelHeight.invoke(prefsDialog,
-                    (Class<?>) null);
+            final Object panelHeight = getPanelHeight.invoke(prefsDialog, (Class<?>) null);
             height = (Integer) panelHeight;
-        } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException
-                | NoSuchMethodException | SecurityException ex) {
+        } catch (ReflectiveOperationException ex) {
             height = 100;
         }
         setLayout(new MigLayout("ins 0, fillx, hmax " + height));
@@ -129,17 +125,19 @@ public class RelayChannelPanel extends JPanel implements ActionListener,
     @Override
     public void actionPerformed(final ActionEvent e) {
         final DefaultTableModel model = ((DefaultTableModel) table.getModel());
-
-        if (e.getActionCommand().equals("Add")) {
-            addRow("#changeme", "changeme");
-        } else if (e.getActionCommand().equals("Delete")) {
-            final int row = table.getSelectedRow();
-            if (table.isEditing()) {
-                table.getCellEditor().stopCellEditing();
-            }
-            if (row > -1) {
-                model.removeRow(row);
-            }
+        switch (e.getActionCommand()) {
+            case "Add":
+                addRow("#changeme", "changeme");
+                break;
+            case "Delete":
+                final int row = table.getSelectedRow();
+                if (table.isEditing()) {
+                    table.getCellEditor().stopCellEditing();
+                }
+                if (row > -1) {
+                    model.removeRow(row);
+                }
+                break;
         }
     }
 
@@ -169,7 +167,7 @@ public class RelayChannelPanel extends JPanel implements ActionListener,
      * @return This panel's current data.
      */
     public List<String[]> getData() {
-        final List<String[]> res = new ArrayList<String[]>();
+        final List<String[]> res = new ArrayList<>();
         final DefaultTableModel model = ((DefaultTableModel) table.getModel());
 
         for (int i = 0; i < model.getRowCount(); i++) {

src/com/dmdirc/addons/scriptplugin/JavaScriptHelper.java

@@ -41,8 +41,7 @@ public class JavaScriptHelper {
     private static final int VERSION = 2;
 
     /** Hashtable for storing stuff. */
-    private static final Map<String, Object> SETTINGS
-            = new HashMap<String, Object>();
+    private static final Map<String, Object> SETTINGS = new HashMap<>();
 
     /**
      * Method to set Stuff.

src/com/dmdirc/addons/scriptplugin/ScriptCommand.java

@@ -35,6 +35,7 @@ import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.lang.reflect.Method;
@@ -43,6 +44,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import javax.script.ScriptException;
+
 /**
  * The Script Command allows controlling of the script plugin.
  */
@@ -50,8 +53,7 @@ public class ScriptCommand extends Command implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("script",
-            "script - Allows controlling the script plugin",
-            CommandType.TYPE_GLOBAL);
+            "script - Allows controlling the script plugin", CommandType.TYPE_GLOBAL);
     /** My Plugin. */
     private final ScriptPlugin myPlugin;
     /** The controller to read/write settings with. */
@@ -64,9 +66,7 @@ public class ScriptCommand extends Command implements IntelligentCommand {
      * @param identityController The controller to read and write settings from.
      * @param commandController The controller to use for command information.
      */
-    public ScriptCommand(
-            final ScriptPlugin myPlugin,
-            final IdentityController identityController,
+    public ScriptCommand(final ScriptPlugin myPlugin, final IdentityController identityController,
             final CommandController commandController) {
         super(commandController);
         this.myPlugin = myPlugin;
@@ -75,8 +75,8 @@ public class ScriptCommand extends Command implements IntelligentCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer origin,
-            final CommandArguments args, final CommandContext context) {
+    public void execute(final FrameContainer origin, final CommandArguments args,
+            final CommandContext context) {
         final String[] sargs = args.getArguments();
 
         if (sargs.length > 0 && (sargs[0].equalsIgnoreCase("rehash") || sargs[0].equalsIgnoreCase("reload"))) {
@@ -116,7 +116,7 @@ public class ScriptCommand extends Command implements IntelligentCommand {
                     wrapper.getScriptEngine().put("cmd_isSilent", args.isSilent());
                     wrapper.getScriptEngine().put("cmd_args", sargs);
                     sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Result: "+wrapper.getScriptEngine().eval(script));
-                } catch (Exception e) {
+                } catch (FileNotFoundException | ScriptException e) {
                     sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Exception: "+e+" -> "+e.getMessage());
 
                     if (identityController.getGlobalConfiguration().getOptionBool(myPlugin.getDomain(), "eval.showStackTrace")) {
@@ -131,7 +131,7 @@ public class ScriptCommand extends Command implements IntelligentCommand {
                                     sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Stack trace: "+line);
                                 }
                             }
-                        } catch (Exception ex) {
+                        } catch (ReflectiveOperationException ex) {
                             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Stack trace: Exception showing stack trace: "+ex+" -> "+ex.getMessage());
                         }
                     }
@@ -149,19 +149,19 @@ public class ScriptCommand extends Command implements IntelligentCommand {
                 if (identityController.getGlobalConfiguration().hasOptionString(myPlugin.getDomain(), "eval.baseFile")) {
                     try {
                         final String baseFile = myPlugin.getScriptDir()+'/'+identityController.getGlobalConfiguration().getOption(myPlugin.getDomain(), "eval.baseFile");
-                        final FileWriter writer = new FileWriter(baseFile, true);
-                        writer.write("function ");
-                        writer.write(functionName);
-                        writer.write("(");
-                        for (int i = 1; i < bits.length; i++) {
-                            writer.write(bits[i]);
-                            writer.write(" ");
+                        try (FileWriter writer = new FileWriter(baseFile, true)) {
+                            writer.write("function ");
+                            writer.write(functionName);
+                            writer.write("(");
+                            for (int i = 1; i < bits.length; i++) {
+                                writer.write(bits[i]);
+                                writer.write(" ");
+                            }
+                            writer.write(") {\n");
+                            writer.write(script);
+                            writer.write("\n}\n");
+                            writer.flush();
                         }
-                        writer.write(") {\n");
-                        writer.write(script);
-                        writer.write("\n}\n");
-                        writer.flush();
-                        writer.close();
                     } catch (IOException ioe) {
                         sendLine(origin, args.isSilent(), FORMAT_ERROR, "IOException: "+ioe.getMessage());
                     }

src/com/dmdirc/addons/scriptplugin/ScriptEngineWrapper.java

@@ -132,7 +132,7 @@ public class ScriptEngineWrapper {
             // There is no "methodExists" function, so we catch NoSuchMethodException
             // and do nothing rather that add an erropr every time a method is called
             // that doesn't exist (such as the action_* methods)
-        } catch (Exception e) {
+        } catch (ScriptException e) {
             Logger.userError(ErrorLevel.LOW, "Error calling '"+functionName+"' in '"+file.getPath()+"': "+e.getMessage(), e);
         }
     }
@@ -151,7 +151,7 @@ public class ScriptEngineWrapper {
             engine = createEngine();
             // Tell it that it has been rehashed
             callFunction("onRehashSucess");
-        } catch (Exception e) {
+        } catch (FileNotFoundException | ScriptException e) {
             Logger.userError(ErrorLevel.LOW, "Reloading '"+file.getPath()+"' failed: "+e.getMessage(), e);
             // Tell it that its rehash failed
             callFunction("onRehashFailed", e);

src/com/dmdirc/addons/scriptplugin/ScriptPlugin.java

@@ -36,6 +36,7 @@ import com.dmdirc.util.validators.ValidationResponse;
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.HashMap;
@@ -43,6 +44,7 @@ import java.util.List;
 import java.util.Map;
 
 import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
 
 /**
  * This allows javascript scripts to be used in DMDirc.
@@ -235,7 +237,7 @@ public class ScriptPlugin extends BaseCommandPlugin implements ActionListener {
             try {
                 final ScriptEngineWrapper wrapper = new ScriptEngineWrapper(this, scriptFilename);
                 scripts.put(scriptFilename, wrapper);
-            } catch (Exception e) {
+            } catch (FileNotFoundException | ScriptException e) {
                 Logger.userError(ErrorLevel.LOW, "Error loading '"+scriptFilename+"': "+e.getMessage(), e);
                 return false;
             }

src/com/dmdirc/addons/serverlists/io/ServerGroupWriter.java

@@ -85,7 +85,7 @@ public class ServerGroupWriter {
     protected void writeGroup(final ServerGroup group, final Set<String> sections) {
         final String domain = group.getName() + " servergroup";
 
-        final List<String> children = new ArrayList<String>();
+        final List<String> children = new ArrayList<>();
 
         for (ServerGroupItem item : group.getItems()) {
             if (item instanceof ServerGroup) {

src/com/dmdirc/addons/swingdebug/TracingEventQueue.java

@@ -33,6 +33,7 @@ import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.plugins.Plugin;
 
 import java.awt.AWTEvent;
+import java.io.IOException;
 import java.lang.management.ManagementFactory;
 import java.lang.management.ThreadInfo;
 import java.lang.management.ThreadMXBean;
@@ -42,6 +43,7 @@ import java.util.Map;
 import java.util.Set;
 
 import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 
 /**
@@ -100,7 +102,7 @@ public class TracingEventQueue extends DMDircEventQueue implements
                 threadBean = ManagementFactory.newPlatformMXBeanProxy(
                         mbeanServer, name.toString(), ThreadMXBean.class);
             }
-        } catch (final Exception e) {
+        } catch (final MalformedObjectNameException | IOException e) {
             e.printStackTrace();
         }
     }

src/com/dmdirc/addons/systray/SystrayPlugin.java

@@ -148,10 +148,13 @@ public class SystrayPlugin extends BaseCommandPlugin implements
      */
     @Override
     public void actionPerformed(final ActionEvent e) {
-        if (e.getActionCommand().equals("Show/hide")) {
-            mainFrame.setVisible(!mainFrame.isVisible());
-        } else if (e.getActionCommand().equals("Quit")) {
-            mainFrame.quit();
+        switch (e.getActionCommand()) {
+            case "Show/hide":
+                mainFrame.setVisible(!mainFrame.isVisible());
+                break;
+            case "Quit":
+                mainFrame.quit();
+                break;
         }
     }
 

src/com/dmdirc/addons/time/TimerCommand.java

@@ -69,66 +69,64 @@ public class TimerCommand extends Command implements IntelligentCommand {
             final CommandArguments args, final CommandContext context) {
 
         if (args.getArguments().length > 0) {
-            if ("--cancel".equals(args.getArguments()[0])) {
-                int timerKey = 0;
-
-                try {
-                    timerKey = Integer.parseInt(args.getArgumentsAsString(1));
-                } catch (NumberFormatException ex) {
-                    doUsage(origin, args.isSilent());
-                    return;
-                }
-
-                if (manager.hasTimerWithID(timerKey)) {
-                    manager.getTimerByID(timerKey).cancelTimer();
-                    sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Timer cancelled");
-                } else {
-                    sendLine(origin, args.isSilent(), FORMAT_ERROR, "There is currently" +
-                            " no timer with that ID");
-                    return;
-                }
-            } else if ("--list".equals(args.getArguments()[0])) {
-                final Set<Entry<Integer, TimedCommand>> timerList
-                        = manager.listTimers();
-
-                if (!timerList.isEmpty()) {
-                    for (Entry<Integer, TimedCommand> entry : timerList) {
-                        sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Timer"
-                                + " ID: " + entry.getKey() + " - " +
-                                entry.getValue().getCommand());
-                    }
-                } else {
-                    sendLine(origin, args.isSilent(), FORMAT_ERROR, "There are " +
-                                "currently no active timers");
-                }
-            } else {
-                if (args.getArguments().length < 3) {
-                    doUsage(origin, args.isSilent());
-                } else {
-                    int repetitions = 0;
-                    int interval = 0;
-
-                    final String command = args.getArgumentsAsString(2);
-
+            switch (args.getArguments()[0]) {
+                case "--cancel":
+                    int timerKey = 0;
                     try {
-                        repetitions = Integer.parseInt(args.getArguments()[0]);
-                        interval = Integer.parseInt(args.getArguments()[1]);
+                        timerKey = Integer.parseInt(args.getArgumentsAsString(1));
                     } catch (NumberFormatException ex) {
                         doUsage(origin, args.isSilent());
                         return;
                     }
-
-                    if (interval < 1) {
-                        sendLine(origin, args.isSilent(), FORMAT_ERROR, "Cannot use" +
-                                " intervals below 1");
+                    if (manager.hasTimerWithID(timerKey)) {
+                        manager.getTimerByID(timerKey).cancelTimer();
+                        sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Timer cancelled");
+                    } else {
+                        sendLine(origin, args.isSilent(), FORMAT_ERROR, "There is currently"
+                                + " no timer with that ID");
                         return;
                     }
-
-                    manager.addTimer(repetitions, interval, command,
-                            origin);
-
-                    sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Command scheduled.");
-                }
+                    break;
+                case "--list":
+                    final Set<Entry<Integer, TimedCommand>> timerList = manager.listTimers();
+                    if (!timerList.isEmpty()) {
+                        for (Entry<Integer, TimedCommand> entry : timerList) {
+                            sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Timer ID: "
+                                    + entry.getKey() + " - " + entry.getValue().getCommand());
+                        }
+                    } else {
+                        sendLine(origin, args.isSilent(), FORMAT_ERROR, "There are " +
+                                "currently no active timers");
+                    }
+                    break;
+                default:
+                    if (args.getArguments().length < 3) {
+                        doUsage(origin, args.isSilent());
+                    } else {
+                        int repetitions = 0;
+                        int interval = 0;
+
+                        final String command = args.getArgumentsAsString(2);
+
+                        try {
+                            repetitions = Integer.parseInt(args.getArguments()[0]);
+                            interval = Integer.parseInt(args.getArguments()[1]);
+                        } catch (NumberFormatException ex) {
+                            doUsage(origin, args.isSilent());
+                            return;
+                        }
+
+                        if (interval < 1) {
+                            sendLine(origin, args.isSilent(), FORMAT_ERROR, "Cannot use" +
+                                    " intervals below 1");
+                            return;
+                        }
+
+                        manager.addTimer(repetitions, interval, command,
+                                origin);
+
+                        sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Command scheduled.");
+                    }   break;
             }
         } else {
             doUsage(origin, args.isSilent());

src/com/dmdirc/addons/ui_swing/PrefsComponentFactory.java

@@ -139,7 +139,7 @@ public final class PrefsComponentFactory {
         option.setPreferredSize(new Dimension(Short.MAX_VALUE, option.getFont().
                 getSize()));
 
-        return new JXLayer<JComponent>(option);
+        return new JXLayer<>(option);
     }
 
     /**

src/com/dmdirc/addons/ui_swing/SwingWindowFactory.java

@@ -28,11 +28,11 @@ import com.dmdirc.addons.ui_swing.components.frames.CustomFrame;
 import com.dmdirc.addons.ui_swing.components.frames.CustomInputFrame;
 import com.dmdirc.addons.ui_swing.components.frames.ServerFrame;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
+import com.dmdirc.interfaces.ui.FrameListener;
+import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.core.components.WindowComponent;
-import com.dmdirc.interfaces.ui.FrameListener;
-import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.util.collections.ListenerList;
 
 import java.util.Arrays;
@@ -50,12 +50,9 @@ import java.util.Set;
 public class SwingWindowFactory implements FrameListener {
 
     /** A map of known implementations of window interfaces. */
-    private final Map<Collection<String>, Class<? extends Window>>
-            implementations = new HashMap<Collection<String>,
-            Class<? extends Window>>();
+    private final Map<Collection<String>, Class<? extends Window>> implementations = new HashMap<>();
     /** A map of frame containers to their Swing windows. */
-    private final Map<FrameContainer, TextFrame> windows
-            = new HashMap<FrameContainer, TextFrame>();
+    private final Map<FrameContainer, TextFrame> windows = new HashMap<>();
     /** The controller that owns this window factory. */
     private final SwingController controller;
     /** Our list of listeners. */
@@ -69,19 +66,19 @@ public class SwingWindowFactory implements FrameListener {
     public SwingWindowFactory(final SwingController controller) {
         this.controller = controller;
 
-        registerImplementation(new HashSet<String>(
+        registerImplementation(new HashSet<>(
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier())),
                 CustomFrame.class);
-        registerImplementation(new HashSet<String>(
+        registerImplementation(new HashSet<>(
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
                 WindowComponent.INPUTFIELD.getIdentifier())),
                 CustomInputFrame.class);
-        registerImplementation(new HashSet<String>(
+        registerImplementation(new HashSet<>(
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
                 WindowComponent.INPUTFIELD.getIdentifier(),
                 WindowComponent.CERTIFICATE_VIEWER.getIdentifier())),
                 ServerFrame.class);
-        registerImplementation(new HashSet<String>(
+        registerImplementation(new HashSet<>(
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
                 WindowComponent.INPUTFIELD.getIdentifier(),
                 WindowComponent.TOPICBAR.getIdentifier(),
@@ -134,8 +131,7 @@ public class SwingWindowFactory implements FrameListener {
         if (implementations.containsKey(window.getComponents())) {
             clazz = implementations.get(window.getComponents());
         } else {
-            Logger.userError(ErrorLevel.HIGH,
-                    "Unable to create window: Unknown type");
+            Logger.userError(ErrorLevel.HIGH, "Unable to create window: Unknown type");
             return null;
         }
 
@@ -145,7 +141,7 @@ public class SwingWindowFactory implements FrameListener {
             windows.put(window, frame);
 
             return frame;
-        } catch (Exception ex) {
+        } catch (ReflectiveOperationException ex) {
             Logger.appError(ErrorLevel.HIGH, "Unable to create window", ex);
             return null;
         }

src/com/dmdirc/addons/ui_swing/cinch/ConfirmAction.java

@@ -103,7 +103,7 @@ public @interface ConfirmAction {
                         ConfirmAction.class);
                 try {
                     wire(action.call(), action.message(), field, context);
-                } catch (Exception e) {
+                } catch (ReflectiveOperationException e) {
                     throw new BindingException("could not wire up "
                             + "@ConfirmAction on " + field.getName(), e);
                 }
@@ -159,7 +159,7 @@ public @interface ConfirmAction {
                             } catch (InvocationTargetException itex) {
                                 LOGGER.error("exception during action firing",
                                         itex.getCause());
-                            } catch (Exception ex) {
+                            } catch (ReflectiveOperationException ex) {
                                 LOGGER.error("exception during action firing", ex);
                             }
                             return true;

src/com/dmdirc/addons/ui_swing/cinch/InputAction.java

@@ -27,6 +27,7 @@ import com.dmdirc.util.validators.PermissiveValidator;
 import com.dmdirc.util.validators.Validator;
 
 import com.google.common.collect.ImmutableList;
+
 import com.palantir.ptoss.cinch.core.Bindable;
 import com.palantir.ptoss.cinch.core.BindableModel;
 import com.palantir.ptoss.cinch.core.Binding;
@@ -120,7 +121,7 @@ public @interface InputAction {
                 try {
                     wire(action.call(), action.message(), action.content(),
                             action.validator(), field, context);
-                } catch (final Exception e) {
+                } catch (ReflectiveOperationException e) {
                     Throwables.throwUncheckedException(e);
                     throw new BindingException("could not wire up "
                             + "@InputAction on " + field.getName(), e);
@@ -210,7 +211,7 @@ public @interface InputAction {
                             } catch (final InvocationTargetException itex) {
                                 LOGGER.error("exception during action firing",
                                         itex.getCause());
-                            } catch (final Exception ex) {
+                            } catch (ReflectiveOperationException ex) {
                                 LOGGER.error("exception during action firing", ex);
                             }
                             return true;
@@ -231,7 +232,7 @@ public @interface InputAction {
                                             .invoke(existingMethod.getObject());
                                     existingMethod.getMethod()
                                             .setAccessible(accessible);
-                                } catch (final Exception e) {
+                                } catch (ReflectiveOperationException e) {
                                     content = "";
                                 }
                             } else {

src/com/dmdirc/addons/ui_swing/cinch/ValidatesIf.java

@@ -77,7 +77,7 @@ public @interface ValidatesIf {
                 final String to = action.to();
                 try {
                     bindings.addAll(wire(to, field, context));
-                } catch (final Exception e) {
+                } catch (IntrospectionException | NoSuchMethodException e) {
                     throw new BindingException("could not wire up @ValidatesIf on " + field.getName(), e);
                 }
             }
@@ -124,7 +124,7 @@ public @interface ValidatesIf {
                     try {
                         ValidationResponse validation = (ValidationResponse) getter.getMethod().invoke(getter.getObject());
                         callMethod.invoke(setValidationObject, validation);
-                    } catch (final Exception e) {
+                    } catch (ReflectiveOperationException e) {
                         Throwables.throwUncheckedException(e);
                     }
                 }

src/com/dmdirc/addons/ui_swing/components/GenericListModel.java

@@ -62,7 +62,7 @@ public class GenericListModel<T> extends AbstractListModel {
     public GenericListModel(final List<T> list) {
         super();
 
-        this.list = Collections.synchronizedList(new ArrayList<T>(list));
+        this.list = Collections.synchronizedList(new ArrayList<>(list));
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/ui_swing/components/NicklistListModel.java

@@ -186,10 +186,13 @@ public final class NicklistListModel extends AbstractListModel implements
     /** {@inheritDoc} */
     @Override
     public void configChanged(final String domain, final String key) {
-        if ("sortByMode".equals(key)) {
-            sortByMode = config.getOptionBool("nicklist", "sortByMode");
-        } else if ("sortByCase".equals(key)) {
-            sortByCase = config.getOptionBool("nicklist", "sortByCase");
+        switch (key) {
+            case "sortByMode":
+                sortByMode = config.getOptionBool("nicklist", "sortByMode");
+                break;
+            case "sortByCase":
+                sortByCase = config.getOptionBool("nicklist", "sortByCase");
+                break;
         }
 
         sort();

src/com/dmdirc/addons/ui_swing/components/SendWorker.java

@@ -92,8 +92,7 @@ public class SendWorker extends LoggingSwingWorker<Object, Void> {
     /** {@inheritDoc} */
     @Override
     protected Object doInBackground() {
-        final Map<String, String> postData =
-                new HashMap<String, String>();
+        final Map<String, String> postData = new HashMap<>();
 
         if (!name.isEmpty()) {
             postData.put("name", name);
@@ -126,8 +125,7 @@ public class SendWorker extends LoggingSwingWorker<Object, Void> {
      */
     private void sendData(final Map<String, String> postData) {
         try {
-            final List<String> response =
-                    Downloader.getPage("http://www.dmdirc.com/feedback.php",
+            final List<String> response = Downloader.getPage("http://www.dmdirc.com/feedback.php",
                     postData);
             if (response.size() >= 1) {
                 for (final String responseLine : response) {

src/com/dmdirc/addons/ui_swing/components/SwingSearchBar.java

@@ -110,7 +110,7 @@ public final class SwingSearchBar extends JPanel implements ActionListener,
 
     /** Initialises components. */
     private void initComponents() {
-        closeButton = new ImageButton<Object>("close",
+        closeButton = new ImageButton<>("close",
                 parent.getIconManager().getIcon("close-inactive"),
                 parent.getIconManager().getIcon("close-active"));
         nextButton = new JButton();

src/com/dmdirc/addons/ui_swing/components/ToolTipPanel.java

@@ -73,7 +73,7 @@ public class ToolTipPanel extends JPanel implements MouseListener {
         super(new MigLayout("hidemode 3"));
 
         defaultHelp = helpText;
-        tooltips = new HashMap<JComponent, String>();
+        tooltips = new HashMap<>();
         icon = new JLabel(iconManager.getIcon("warning"));
 
         setBackground(Color.WHITE);

src/com/dmdirc/addons/ui_swing/components/URLProtocolPanel.java

@@ -211,17 +211,21 @@ public class URLProtocolPanel extends JPanel implements ActionListener,
             final String option =
                     controller.getGlobalConfig().getOption("protocol",
                             uri.getScheme());
-
-            if ("DMDIRC".equals(option)) {
-                optionType.setSelected(dmdirc.getModel(), true);
-            } else if ("BROWSER".equals(option)) {
-                optionType.setSelected(browser.getModel(), true);
-            } else if ("MAIL".equals(option)) {
-                optionType.setSelected(mail.getModel(), true);
-            } else {
-                optionType.setSelected(custom.getModel(), true);
-                commandPath.setText(option);
-                actionPerformed(null);
+            switch (option) {
+                case "DMDIRC":
+                    optionType.setSelected(dmdirc.getModel(), true);
+                    break;
+                case "BROWSER":
+                    optionType.setSelected(browser.getModel(), true);
+                    break;
+                case "MAIL":
+                    optionType.setSelected(mail.getModel(), true);
+                    break;
+                default:
+                    optionType.setSelected(custom.getModel(), true);
+                    commandPath.setText(option);
+                    actionPerformed(null);
+                    break;
             }
         } else {
             optionType.clearSelection();

src/com/dmdirc/addons/ui_swing/components/expandingsettings/CurrentOptionsPanel.java

@@ -66,7 +66,7 @@ public final class CurrentOptionsPanel extends JPanel implements
         this.parent = parent;
 
         setOpaque(UIUtilities.getTabbedPaneOpaque());
-        settings = new ArrayList<JComponent>();
+        settings = new ArrayList<>();
     }
 
     /** Clears all the current options. */
@@ -106,7 +106,7 @@ public final class CurrentOptionsPanel extends JPanel implements
      */
     private void addCurrentOption(final JComponent component) {
         final JLabel label = new JLabel();
-        final ImageButton<JComponent> button = new ImageButton<JComponent>(
+        final ImageButton<JComponent> button = new ImageButton<>(
                 component.getName(), iconManager.getIcon("close-inactive"),
                 iconManager.getIcon("close-active"));
         button.setObject(component);

src/com/dmdirc/addons/ui_swing/components/expandingsettings/SettingsPanel.java

@@ -85,7 +85,7 @@ public class SettingsPanel extends JPanel {
 
         this.controller = controller;
 
-        settings = new DoubleMap<PreferencesSetting, JComponent>();
+        settings = new DoubleMap<>();
 
         setOpaque(UIUtilities.getTabbedPaneOpaque());
         this.padding = padding;

src/com/dmdirc/addons/ui_swing/components/frames/ComponentCreator.java

@@ -50,12 +50,11 @@ public class ComponentCreator {
      *
      * @return Set of initialised components
      */
-    public Set<JComponent> initFrameComponents(final Object frame,
-            final SwingController controller,
+    public Set<JComponent> initFrameComponents(final Object frame, final SwingController controller,
             final FrameContainer owner) {
         final SimpleInjector injector = new SimpleInjector();
         final Set<String> names = owner.getComponents();
-        final Set<JComponent> components = new HashSet<JComponent>();
+        final Set<JComponent> components = new HashSet<>();
 
         injector.addParameter(frame);
         injector.addParameter(owner);
@@ -68,21 +67,15 @@ public class ComponentCreator {
                 Class<?> clazz = null;
                 if (string.equals(WindowComponent.INPUTFIELD.getIdentifier())) {
                     clazz = SwingInputField.class;
-                } else if (string.equals(WindowComponent.TEXTAREA
-                        .getIdentifier())) {
+                } else if (string.equals(WindowComponent.TEXTAREA.getIdentifier())) {
                     clazz = TextPane.class;
                 } else {
                     clazz = Class.forName(string);
                 }
                 object = injector.createInstance(clazz);
-            } catch(ClassNotFoundException ex) {
+            } catch(ClassNotFoundException | IllegalArgumentException ex) {
                 object = null;
-                Logger.userError(ErrorLevel.HIGH, "Unable to create component: "
-                        + ex.getMessage());
-            } catch (IllegalArgumentException ex) {
-                object = null;
-                Logger.userError(ErrorLevel.HIGH, "Unable to create component: "
-                        + ex.getMessage());
+                Logger.userError(ErrorLevel.HIGH, "Unable to create component: " + ex.getMessage());
             }
             if (object instanceof JComponent) {
                 components.add((JComponent) object);

src/com/dmdirc/addons/ui_swing/components/frames/InputTextFrame.java

@@ -368,22 +368,25 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
 
         if ("ui".equals(domain) && getContainer().getConfigManager() != null
                 && getInputField() != null && !UIUtilities.isGTKUI()) {
-            if ("inputbackgroundcolour".equals(key)
-                    || "backgroundcolour".equals(key)) {
-                getInputField().setBackground(UIUtilities.convertColour(
-                        getContainer().getConfigManager().
-                        getOptionColour("ui", "inputbackgroundcolour",
-                        "ui", "backgroundcolour")));
-            } else if ("inputforegroundcolour".equals(key)
-                    || "foregroundcolour".equals(key)) {
-                getInputField().setForeground(UIUtilities.convertColour(
-                        getContainer().getConfigManager()
-                        .getOptionColour("ui", "inputforegroundcolour",
-                        "ui", "foregroundcolour")));
-                getInputField().setCaretColor(UIUtilities.convertColour(
-                        getContainer().getConfigManager()
-                        .getOptionColour("ui", "inputforegroundcolour",
-                        "ui", "foregroundcolour")));
+            switch (key) {
+                case "inputbackgroundcolour":
+                case "backgroundcolour":
+                    getInputField().setBackground(UIUtilities.convertColour(
+                            getContainer().getConfigManager().
+                                    getOptionColour("ui", "inputbackgroundcolour",
+                                            "ui", "backgroundcolour")));
+                    break;
+                case "inputforegroundcolour":
+                case "foregroundcolour":
+                    getInputField().setForeground(UIUtilities.convertColour(
+                            getContainer().getConfigManager()
+                                    .getOptionColour("ui", "inputforegroundcolour",
+                                            "ui", "foregroundcolour")));
+                    getInputField().setCaretColor(UIUtilities.convertColour(
+                            getContainer().getConfigManager()
+                                    .getOptionColour("ui", "inputforegroundcolour",
+                                            "ui", "foregroundcolour")));
+                    break;
             }
         }
     }

src/com/dmdirc/addons/ui_swing/components/menubar/ChannelMenu.java

@@ -105,18 +105,21 @@ public class ChannelMenu extends JMenu implements ActionListener,
     /** {@inheritDoc} */
     @Override
     public void actionPerformed(final ActionEvent e) {
-        if (e.getActionCommand().equals("JoinChannel")) {
-            new ChannelJoinDialog(controller, ModalityType.MODELESS,
-                    "Join channel", "Enter the name of the channel to join.")
-                    .display();
-        } else if (e.getActionCommand().equals("ChannelSettings")) {
-            final FrameContainer activeWindow = controller.getMainFrame()
-                    .getActiveFrame().getContainer();
-            if (activeWindow instanceof Channel) {
-                controller.showChannelSettingsDialog(((Channel) activeWindow));
-            }
-        } else if (e.getActionCommand().equals("ListChannels")) {
-            new ChannelListDialog(controller).display();
+        switch (e.getActionCommand()) {
+            case "JoinChannel":
+                new ChannelJoinDialog(controller, ModalityType.MODELESS,
+                        "Join channel", "Enter the name of the channel to join.")
+                        .display();
+                break;
+            case "ChannelSettings":
+                final FrameContainer activeWindow = controller.getMainFrame()
+                        .getActiveFrame().getContainer();
+                if (activeWindow instanceof Channel) {
+                    controller.showChannelSettingsDialog(((Channel) activeWindow));
+                }   break;
+            case "ListChannels":
+                new ChannelListDialog(controller).display();
+                break;
         }
     }
 

src/com/dmdirc/addons/ui_swing/components/menubar/ServerMenu.java

@@ -112,16 +112,21 @@ public class ServerMenu extends JMenu implements ActionListener,
     /** {@inheritDoc} */
     @Override
     public void actionPerformed(final ActionEvent e) {
-        if ("NewServer".equals(e.getActionCommand())) {
-            controller.showDialog(NewServerDialog.class);
-        } else if (e.getActionCommand().equals("Exit")) {
-            mainFrame.quit();
-        } else if (e.getActionCommand().equals("ServerSettings")) {
-            controller.showServerSettingsDialog(controller.getMainFrame()
-                    .getActiveFrame().getContainer().getServer());
-        } else if (e.getActionCommand().equals("Disconnect")) {
-            controller.getMainFrame().getActiveFrame().getContainer()
-                    .getServer().disconnect();
+        switch (e.getActionCommand()) {
+            case "NewServer":
+                controller.showDialog(NewServerDialog.class);
+                break;
+            case "Exit":
+                mainFrame.quit();
+                break;
+            case "ServerSettings":
+                controller.showServerSettingsDialog(controller.getMainFrame()
+                        .getActiveFrame().getContainer().getServer());
+                break;
+            case "Disconnect":
+                controller.getMainFrame().getActiveFrame().getContainer()
+                        .getServer().disconnect();
+                break;
         }
     }
 

src/com/dmdirc/addons/ui_swing/components/menubar/SettingsMenu.java

@@ -92,14 +92,19 @@ public class SettingsMenu extends JMenu implements ActionListener {
     /** {@inheritDoc} */
     @Override
     public void actionPerformed(final ActionEvent e) {
-        if ("Preferences".equals(e.getActionCommand())) {
-            controller.showDialog(SwingPreferencesDialog.class);
-        } else if (e.getActionCommand().equals("Profile")) {
-            controller.showDialog(ProfileManagerDialog.class);
-        }  else if (e.getActionCommand().equals("Actions")) {
-            controller.showDialog(ActionsManagerDialog.class);
-        } else if (e.getActionCommand().equals("Aliases")) {
-            controller.showDialog(AliasManagerDialog.class);
+        switch (e.getActionCommand()) {
+            case "Preferences":
+                controller.showDialog(SwingPreferencesDialog.class);
+                break;
+            case "Profile":
+                controller.showDialog(ProfileManagerDialog.class);
+                break;
+            case "Actions":
+                controller.showDialog(ActionsManagerDialog.class);
+                break;
+            case "Aliases":
+                controller.showDialog(AliasManagerDialog.class);
+                break;
         }
     }
 }

src/com/dmdirc/addons/ui_swing/components/modes/ModesPane.java

@@ -63,9 +63,9 @@ public abstract class ModesPane extends JPanel {
         setLayout(new MigLayout("fill, wmax 100%, wrap 1"));
         booleanModesPanel = new JPanel(new MigLayout("wrap 2"));
         paramModesPanel = new JPanel(new MigLayout("wrap 2"));
-        modes = new TreeSet<String>(new ModesComparator());
-        modeCheckBoxes = new HashMap<String, JCheckBox>();
-        modeInputs = new HashMap<String, ParamModePanel>();
+        modes = new TreeSet<>(new ModesComparator());
+        modeCheckBoxes = new HashMap<>();
+        modeInputs = new HashMap<>();
         this.setOpaque(UIUtilities.getTabbedPaneOpaque());
     }
 

src/com/dmdirc/addons/ui_swing/components/renderers/URIHandlerCellRenderer.java

@@ -52,16 +52,22 @@ public class URIHandlerCellRenderer extends DefaultTableCellRenderer {
         }
 
         String handler = (String) value;
-        if ("DMDIRC".equals(handler)) {
-            handler = "Handle internally (irc links only).";
-        } else if ("BROWSER".equals(handler)) {
-            handler = "Use browser (or system registered handler).";
-        } else if ("MAIL".equals(handler)) {
-            handler = "Use mail client.";
-        } else if ("".equals(handler)) {
-            handler = "No handler.";
-        } else {
-            handler = "Custom command: " + handler;
+        switch (handler) {
+            case "DMDIRC":
+                handler = "Handle internally (irc links only).";
+                break;
+            case "BROWSER":
+                handler = "Use browser (or system registered handler).";
+                break;
+            case "MAIL":
+                handler = "Use mail client.";
+                break;
+            case "":
+                handler = "No handler.";
+                break;
+            default:
+                handler = "Custom command: " + handler;
+                break;
         }
 
         setValue(handler);

src/com/dmdirc/addons/ui_swing/components/reorderablelist/ArrayListTransferHandler.java

@@ -221,7 +221,7 @@ public final class ArrayListTransferHandler extends TransferHandler {
                 return null;
             }
 
-            final ArrayList<Object> alist = new ArrayList<Object>(values.length);
+            final ArrayList<Object> alist = new ArrayList<>(values.length);
 
             for (int i = 0; i < values.length; i++) {
                 final Object o = values[i];

src/com/dmdirc/addons/ui_swing/components/reorderablelist/ReorderableJList.java

@@ -258,9 +258,7 @@ public class ReorderableJList extends JList implements DragSourceListener,
         Object dragged;
         try {
             dragged = dtde.getTransferable().getTransferData(dataFlavor);
-        } catch (UnsupportedFlavorException e) {
-            return;
-        } catch (IOException e) {
+        } catch (UnsupportedFlavorException | IOException e) {
             return;
         }
 
@@ -293,7 +291,7 @@ public class ReorderableJList extends JList implements DragSourceListener,
         //get the list object
         final Object target = getModel().getElementAt(index);
         //create the trasnferable object
-        final ArrayList<Object> transferObject = new ArrayList<Object>();
+        final ArrayList<Object> transferObject = new ArrayList<>();
         transferObject.add(target);
         final Transferable trans = new ArrayListTransferable(transferObject);
         //start drag

src/com/dmdirc/addons/ui_swing/components/statusbar/ErrorPopup.java

@@ -66,12 +66,9 @@ public class ErrorPopup extends StatusbarPopupWindow {
     /** {@inheritDoc} */
     @Override
     protected void initContent(final JPanel panel) {
-        final List<ProgramError> errors = ErrorManager.getErrorManager()
-                .getErrors();
-        final MapList<ErrorLevel, ProgramError> buckets
-                = new MapList<ErrorLevel, ProgramError>();
-        final MapList<ErrorReportStatus, ProgramError> statuses
-                = new MapList<ErrorReportStatus, ProgramError>();
+        final List<ProgramError> errors = ErrorManager.getErrorManager().getErrors();
+        final MapList<ErrorLevel, ProgramError> buckets = new MapList<>();
+        final MapList<ErrorReportStatus, ProgramError> statuses = new MapList<>();
 
         for (final ProgramError error : errors) {
             buckets.add(error.getLevel(), error);

src/com/dmdirc/addons/ui_swing/components/statusbar/MessageLabel.java

@@ -78,7 +78,7 @@ public class MessageLabel extends JPanel implements StatusBarComponent,
             final Window parentWindow) {
         super(new MigLayout("fill, ins 0, gap 0  0"));
         this.controller = controller;
-        queue = new ConcurrentLinkedQueue<StatusMessage>();
+        queue = new ConcurrentLinkedQueue<>();
         defaultMessage = new StatusMessage(null, "Ready.", null, -1,
                 controller.getGlobalConfig());
         currentMessage = defaultMessage;

src/com/dmdirc/addons/ui_swing/components/statusbar/MessagePopup.java

@@ -73,7 +73,7 @@ class MessagePopup extends StatusbarTogglePanel<JLabel> {
         this.parentWindow = parentWindow;
         this.parent = parent;
         this.controller = controller;
-        messages = new RollingList<StatusMessage>(5);
+        messages = new RollingList<>(5);
     }
 
     /* {@inheritDoc} */

src/com/dmdirc/addons/ui_swing/components/text/WrapColumnFactory.java

@@ -26,16 +26,17 @@ public class WrapColumnFactory implements ViewFactory {
     public View create(final Element elem) {
         final String kind = elem.getName();
         if (kind != null) {
-            if (kind.equals(AbstractDocument.ContentElementName)) {
-                return new WrapLabelView(elem);
-            } else if (kind.equals(AbstractDocument.ParagraphElementName)) {
-                return new NoWrapParagraphView(elem);
-            } else if (kind.equals(AbstractDocument.SectionElementName)) {
-                return new BoxView(elem, View.Y_AXIS);
-            } else if (kind.equals(StyleConstants.ComponentElementName)) {
-                return new ComponentView(elem);
-            } else if (kind.equals(StyleConstants.IconElementName)) {
-                return new IconView(elem);
+            switch (kind) {
+                case AbstractDocument.ContentElementName:
+                    return new WrapLabelView(elem);
+                case AbstractDocument.ParagraphElementName:
+                    return new NoWrapParagraphView(elem);
+                case AbstractDocument.SectionElementName:
+                    return new BoxView(elem, View.Y_AXIS);
+                case StyleConstants.ComponentElementName:
+                    return new ComponentView(elem);
+                case StyleConstants.IconElementName:
+                    return new IconView(elem);
             }
         }
 

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionConditionDisplayPanel.java

@@ -129,7 +129,7 @@ public class ActionConditionDisplayPanel extends JPanel implements
         label = new TextLabel("", false);
         editButton = new ImageToggleButton("edit", iconManager.
                 getIcon("edit-inactive"), iconManager.getIcon("edit"));
-        deleteButton = new ImageButton<Object>("delete", iconManager.
+        deleteButton = new ImageButton<>("delete", iconManager.
                 getIcon("close-inactive"), iconManager.
                 getIcon("close-inactive"), iconManager.getIcon("close-active"));
 

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionNamePanel.java

@@ -108,7 +108,7 @@ public class ActionNamePanel extends JPanel implements PropertyChangeListener {
         } else {
             this.existingName = newName;
         }
-        name.setValidator(new ValidatorChain<String>(new FileNameValidator(),
+        name.setValidator(new ValidatorChain<>(new FileNameValidator(),
                 new ActionNameValidator(group, existingName)));
         this.name.setText(newName);
     }
@@ -123,7 +123,7 @@ public class ActionNamePanel extends JPanel implements PropertyChangeListener {
     private void initComponents() {
         name = new ValidatingJTextField(iconManager,
                 new JTextField(existingName),
-                new ValidatorChain<String>(new FileNameValidator(),
+                new ValidatorChain<>(new FileNameValidator(),
                 new ActionNameValidator(group, existingName)));
     }
 

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionResponsePanel.java

@@ -83,7 +83,7 @@ public class ActionResponsePanel extends JPanel {
         ((DefaultComboBoxModel) formatter.getModel()).addElement("No change");
         ((DefaultComboBoxModel) formatter.getModel()).addElement("No response");
 
-        final TreeSet<String> formatters = new TreeSet<String>(
+        final TreeSet<String> formatters = new TreeSet<>(
                 String.CASE_INSENSITIVE_ORDER);
         formatters.addAll(controller.getGlobalConfig().getOptions("formatter")
                 .keySet());
@@ -163,12 +163,13 @@ public class ActionResponsePanel extends JPanel {
      */
     public String getFormatter() {
         final String newFormat = (String) formatter.getSelectedItem();
-        if ("No change".equals(newFormat)) {
-            return null;
-        } else if ("No response".equals(newFormat)) {
-            return "";
-        } else {
-            return newFormat;
+        switch (newFormat) {
+            case "No change":
+                return null;
+            case "No response":
+                return "";
+            default:
+                return newFormat;
         }
     }
 

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionTriggersListPanel.java

@@ -77,7 +77,7 @@ public class ActionTriggersListPanel extends JPanel {
         super();
 
         this.iconManager = iconManager;
-        this.triggers = new ArrayList<ActionType>(triggers);
+        this.triggers = new ArrayList<>(triggers);
 
         initComponents();
         layoutComponents();
@@ -101,7 +101,7 @@ public class ActionTriggersListPanel extends JPanel {
             removeAll();
 
             for (final ActionType trigger : triggers) {
-                final ImageButton<?> button = new ImageButton<Object>(
+                final ImageButton<?> button = new ImageButton<>(
                         "delete", iconManager.getIcon("close-inactive"),
                         iconManager.getIcon("close-active"));
                 button.addActionListener(new ActionListener() {

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionTriggersPanel.java

@@ -79,7 +79,7 @@ public class ActionTriggersPanel extends JPanel implements ActionListener,
     public ActionTriggersPanel(final IconManager iconManager) {
         super();
 
-        compatibleTriggers = new ArrayList<ActionType>();
+        compatibleTriggers = new ArrayList<>();
 
         initComponents(iconManager);
         addListeners();

src/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionGroupSettingsPanel.java

@@ -101,7 +101,7 @@ public final class ActionGroupSettingsPanel extends JPanel implements ActionList
      * Initialises the components.
      */
     private void initComponents() {
-        settingMap = new HashMap<JButton, PreferencesSetting>();
+        settingMap = new HashMap<>();
     }
 
     /**
@@ -147,7 +147,7 @@ public final class ActionGroupSettingsPanel extends JPanel implements ActionList
      */
     public void setActionGroup(final ActionGroup group) {
         if (group == null || group.getSettings().isEmpty()) {
-            this.settings = new ArrayList<PreferencesSetting>();
+            this.settings = new ArrayList<>();
         } else {
             this.settings = group.getSettings().values();
         }

src/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionTableModel.java

@@ -61,7 +61,7 @@ public class ActionTableModel extends AbstractTableModel {
         super();
 
         if (actions == null) {
-            this.actions = new ArrayList<Action>();
+            this.actions = new ArrayList<>();
         } else {
             this.actions = actions;
         }
@@ -165,7 +165,7 @@ public class ActionTableModel extends AbstractTableModel {
     public void setActionGroup(final ActionGroup group) {
         synchronized (actions) {
             if (group == null) {
-                actions = new ArrayList<Action>();
+                actions = new ArrayList<>();
             } else {
                 actions = group.getActions();
             }

src/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionsGroupPanel.java

@@ -33,8 +33,8 @@ import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 import com.dmdirc.addons.ui_swing.dialogs.StringArrayComparator;
 import com.dmdirc.addons.ui_swing.dialogs.actioneditor.ActionEditorDialog;
 
-import java.awt.Window;
 import java.awt.Dialog.ModalityType;
+import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
@@ -138,8 +138,7 @@ public final class ActionsGroupPanel extends JPanel implements ActionListener,
      */
     private void initComponents() {
         scrollPane = new JScrollPane();
-        model = new ActionTableModel(group == null ? new ArrayList<Action>()
-                : group.getActions());
+        model = new ActionTableModel(group == null ? new ArrayList<Action>() : group.getActions());
         table = new PackingTable(model, scrollPane, false) {
 
             /**
@@ -150,16 +149,13 @@ public final class ActionsGroupPanel extends JPanel implements ActionListener,
              */
             private static final long serialVersionUID = 1;
             /** Action type renderer. */
-            private final ActionTypeTableCellRenderer typeRenderer =
-                    new ActionTypeTableCellRenderer();
+            private final ActionTypeTableCellRenderer typeRenderer = new ActionTypeTableCellRenderer();
             /** Action response renrderer. */
-            private final ArrayCellRenderer arrayRenderer =
-                    new ArrayCellRenderer();
+            private final ArrayCellRenderer arrayRenderer = new ArrayCellRenderer();
 
             /** {@inheritDoc} */
             @Override
-            public TableCellRenderer getCellRenderer(final int row,
-                    final int column) {
+            public TableCellRenderer getCellRenderer(final int row, final int column) {
                 switch (column) {
                     case 1:
                         return typeRenderer;
@@ -173,7 +169,7 @@ public final class ActionsGroupPanel extends JPanel implements ActionListener,
 
 
         final TableRowSorter<ActionTableModel> sorter
-                = new TableRowSorter<ActionTableModel>(model);
+                = new TableRowSorter<>(model);
         sorter.setComparator(1, new ActionTypeComparator());
         sorter.setComparator(2, new StringArrayComparator());
 

src/com/dmdirc/addons/ui_swing/dialogs/aliases/AliasTableModel.java

@@ -58,7 +58,7 @@ public final class AliasTableModel extends AbstractTableModel {
     public AliasTableModel(final List<Alias> aliases) {
         super();
 
-        this.aliases = new ArrayList<Alias>(aliases);
+        this.aliases = new ArrayList<>(aliases);
     }
 
     /**
@@ -67,7 +67,7 @@ public final class AliasTableModel extends AbstractTableModel {
      * @param aliases List of aliases
      */
     public void setAliases(final List<Alias> aliases) {
-        this.aliases = new ArrayList<Alias>(aliases);
+        this.aliases = new ArrayList<>(aliases);
 
         fireTableDataChanged();
     }
@@ -181,7 +181,7 @@ public final class AliasTableModel extends AbstractTableModel {
      * @return Complete alias list
      */
     public List<Alias> getAliases() {
-        return new ArrayList<Alias>(aliases);
+        return new ArrayList<>(aliases);
     }
 
     /**

src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelListModesPane.java

@@ -28,13 +28,13 @@ import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.renderers.ExtendedListModeCellRenderer;
 import com.dmdirc.addons.ui_swing.components.renderers.ListModeCellRenderer;
 import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
-import com.dmdirc.util.validators.NotEmptyValidator;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.parser.common.ChannelListModeItem;
 import com.dmdirc.util.collections.MapList;
+import com.dmdirc.util.validators.NotEmptyValidator;
 
-import java.awt.Window;
 import java.awt.Dialog.ModalityType;
+import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
@@ -119,25 +119,23 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
 
         list = new JList();
         nativeRenderer = list.getCellRenderer();
-        if (channel.getConfigManager().getOptionBool("general",
-                "extendedListModes")) {
+        if (channel.getConfigManager().getOptionBool("general", "extendedListModes")) {
             renderer = new ExtendedListModeCellRenderer();
         } else {
             renderer = new ListModeCellRenderer(nativeRenderer);
         }
         listModesPanel = new JScrollPane();
-        listModesPanels = new ArrayList<JList>();
+        listModesPanels = new ArrayList<>();
         listModesArray = channel.getServer().getParser().getListChannelModes().
                 toCharArray();
-        existingListItems = new MapList<Character, ChannelListModeItem>();
+        existingListItems = new MapList<>();
         listModesMenu = new JComboBox(new DefaultComboBoxModel());
         addListModeButton = new JButton("Add");
         removeListModeButton = new JButton("Remove");
         removeListModeButton.setEnabled(false);
         modeCount = new JLabel();
-        toggle = new JCheckBox("Show extended information",
-                channel.getConfigManager().getOptionBool("general",
-                "extendedListModes"));
+        toggle = new JCheckBox("Show extended information", channel.getConfigManager()
+                .getOptionBool("general", "extendedListModes"));
         toggle.setOpaque(UIUtilities.getTabbedPaneOpaque());
 
         initListModesPanel();
@@ -158,9 +156,8 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
             if (listItems == null) {
                 continue;
             }
-            existingListItems.add(mode, new ArrayList<ChannelListModeItem>(listItems));
-            final DefaultListModel model =
-                    (DefaultListModel) listModesPanels.get(i).getModel();
+            existingListItems.add(mode, new ArrayList<>(listItems));
+            final DefaultListModel model =(DefaultListModel) listModesPanels.get(i).getModel();
 
             model.removeAllElements();
             for (ChannelListModeItem listItem : listItems) {
@@ -180,12 +177,10 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
             addListModeButton.setEnabled(true);
         }
 
-        final DefaultComboBoxModel model =
-                (DefaultComboBoxModel) listModesMenu.getModel();
+        final DefaultComboBoxModel model = (DefaultComboBoxModel) listModesMenu.getModel();
         for (char mode : listModesArray) {
             String modeText = mode + " list";
-            if (channel.getConfigManager().hasOptionString("server", "mode"
-                    + mode)) {
+            if (channel.getConfigManager().hasOptionString("server", "mode" + mode)) {
                 modeText = channel.getConfigManager().getOption("server",
                         "mode" + mode) + " list [+" + mode + "]";
             }
@@ -230,34 +225,28 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
         removeListModeButton.addActionListener(this);
         listModesMenu.addActionListener(this);
         toggle.addActionListener(this);
-        channel.getConfigManager().addChangeListener("general",
-                "extendedListModes", this);
+        channel.getConfigManager().addChangeListener("general", "extendedListModes", this);
 
     }
 
     /** Sends the list modes to the server. */
     public void save() {
-        final Map<ChannelListModeItem, Character> currentModes =
-                new HashMap<ChannelListModeItem, Character>();
-        final Map<ChannelListModeItem, Character> newModes =
-                new HashMap<ChannelListModeItem, Character>();
+        final Map<ChannelListModeItem, Character> currentModes = new HashMap<>();
+        final Map<ChannelListModeItem, Character> newModes = new HashMap<>();
 
         for (int i = 0; i < listModesArray.length;
                 i++) {
             final char mode = listModesArray[i];
-            final Enumeration<?> values =
-                    ((DefaultListModel) listModesPanels.get(i).getModel()).
+            final Enumeration<?> values = ((DefaultListModel) listModesPanels.get(i).getModel()).
                     elements();
-            final List<ChannelListModeItem> listItems =
-                    existingListItems.get(mode);
+            final List<ChannelListModeItem> listItems = existingListItems.get(mode);
 
             for (ChannelListModeItem listItem : listItems) {
                 currentModes.put(listItem, mode);
             }
 
             while (values.hasMoreElements()) {
-                final ChannelListModeItem value =
-                        (ChannelListModeItem) values.nextElement();
+                final ChannelListModeItem value = (ChannelListModeItem) values.nextElement();
                 newModes.put(value, mode);
             }
         }
@@ -266,22 +255,17 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
             if (currentModes.containsKey(entry.getKey())) {
                 currentModes.remove(entry.getKey());
             } else {
-                channel.getChannelInfo().
-                        alterMode(true, entry.getValue(),
-                        entry.getKey().getItem());
+                channel.getChannelInfo().alterMode(true, entry.getValue(), entry.getKey().getItem());
             }
         }
 
-        for (Entry<ChannelListModeItem, Character> entry :
-                currentModes.entrySet()) {
-            channel.getChannelInfo().
-                    alterMode(false, entry.getValue(), entry.getKey().getItem());
+        for (Entry<ChannelListModeItem, Character> entry : currentModes.entrySet()) {
+            channel.getChannelInfo().alterMode(false, entry.getValue(), entry.getKey().getItem());
         }
 
         channel.getChannelInfo().flushModes();
 
-        controller.getGlobalIdentity().setOption("general",
-                "extendedListModes", toggle.isSelected());
+        controller.getGlobalIdentity().setOption("general", "extendedListModes", toggle.isSelected());
     }
 
     /** Adds a list mode. */

src/com/dmdirc/addons/ui_swing/dialogs/prefs/URLConfigPanel.java

@@ -135,7 +135,7 @@ public class URLConfigPanel extends JPanel implements
         table.setRowSelectionAllowed(true);
         table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         table.getRowSorter().toggleSortOrder(0);
-        details = new HashMap<URI, URLProtocolPanel>();
+        details = new HashMap<>();
         empty = new URLProtocolPanel(controller, null, true);
         activeComponent = empty;
         add = new JButton("Add");

src/com/dmdirc/addons/ui_swing/dialogs/prefs/URLHandlerTableModel.java

@@ -211,7 +211,7 @@ public class URLHandlerTableModel extends AbstractTableModel {
      * @return URL Handler map
      */
     public Map<URI, String> getURLHandlers() {
-        final Map<URI, String> urlHandlers = new HashMap<URI, String>();
+        final Map<URI, String> urlHandlers = new HashMap<>();
 
         for (int i = 0; i < uris.size(); i++) {
             urlHandlers.put(uris.get(i), handlers.get(i));

src/com/dmdirc/addons/ui_swing/dialogs/prefs/UpdateTableModel.java

@@ -65,8 +65,8 @@ public class UpdateTableModel extends AbstractTableModel {
     public UpdateTableModel(final Collection<UpdateComponent> updates) {
         super();
 
-        this.updates = new ArrayList<UpdateComponent>(updates);
-        this.enabled = new HashMap<UpdateComponent, Boolean>();
+        this.updates = new ArrayList<>(updates);
+        this.enabled = new HashMap<>();
 
         for (UpdateComponent update : this.updates) {
             enabled.put(update,

src/com/dmdirc/addons/ui_swing/dialogs/serversetting/IgnoreListPanel.java

@@ -181,7 +181,7 @@ public final class IgnoreListPanel extends JPanel implements ActionListener,
             new StandardInputDialog(controller, parentWindow,
                     ModalityType.MODELESS, "New ignore list entry",
                     "Please enter the new ignore list entry",
-                    viewToggle.isSelected() ? new ValidatorChain<String>(
+                    viewToggle.isSelected() ? new ValidatorChain<>(
                     new NotEmptyValidator(), new RegexValidator())
                     : new NotEmptyValidator()) {
 

src/com/dmdirc/addons/ui_swing/dialogs/sslcertificate/CertificateInfoPanel.java

@@ -69,13 +69,12 @@ public class CertificateInfoPanel extends JScrollPane {
 
     private void initComponents() {
         content = new JPanel();
-        certificateInfo = new ArrayList<List<CertificateInformationEntry>>();
+        certificateInfo = new ArrayList<>();
     }
 
     private void layoutComponents() {
         setBorder(BorderFactory.createTitledBorder(UIManager.getBorder(
-                "TitledBorder.border"), "Information for " +
-                certificateName));
+                "TitledBorder.border"), "Information for " + certificateName));
         content.setVisible(false);
         content.removeAll();
         content.setLayout(new MigLayout("fillx, wmax 100%, wrap 2, pack"));
@@ -83,8 +82,7 @@ public class CertificateInfoPanel extends JScrollPane {
         int i = 1;
         for (List<CertificateInformationEntry> entry : certificateInfo) {
             for (CertificateInformationEntry info : entry) {
-                content.add(new TextLabel(info.getTitle() + ": "),
-                        "alignx right");
+                content.add(new TextLabel(info.getTitle() + ": "), "alignx right");
                 final TextLabel text = new TextLabel(info.getValue(), false);
                 if (info.isInvalid()) {
                     final SimpleAttributeSet sas = new SimpleAttributeSet();
@@ -120,8 +118,7 @@ public class CertificateInfoPanel extends JScrollPane {
         this.certificateName = certificateName;
 
         if (certificateInfo == null) {
-            this.certificateInfo =
-                    new ArrayList<List<CertificateInformationEntry>>();
+            this.certificateInfo = new ArrayList<>();
         }
         layoutComponents();
     }

src/com/dmdirc/addons/ui_swing/dialogs/sslcertificate/SummaryPanel.java

@@ -53,7 +53,7 @@ public class SummaryPanel extends JPanel {
      */
     public SummaryPanel(final IconManager iconManager) {
         this.iconManager = iconManager;
-        summary = new ArrayList<CertificateSummaryEntry>();
+        summary = new ArrayList<>();
         layoutComponents();
     }
 

src/com/dmdirc/addons/ui_swing/dialogs/updater/UpdateTableModel.java

@@ -51,11 +51,11 @@ public class UpdateTableModel extends AbstractTableModel implements UpdateStatus
     /** The update manager to use. */
     private final CachingUpdateManager updateManager;
     /** Data list. */
-    private final List<UpdateComponent> updates = new ArrayList<UpdateComponent>();
+    private final List<UpdateComponent> updates = new ArrayList<>();
     /** Enabled list. */
-    private final List<UpdateComponent> enabled = new ArrayList<UpdateComponent>();
+    private final List<UpdateComponent> enabled = new ArrayList<>();
     /** Cached progress for each component. */
-    private final Map<UpdateComponent, Double> progress = new HashMap<UpdateComponent, Double>();
+    private final Map<UpdateComponent, Double> progress = new HashMap<>();
     /** Number formatter. */
     private NumberFormat formatter;
 

src/com/dmdirc/addons/ui_swing/dialogs/url/URLSubsitutionsPanel.java

@@ -67,7 +67,7 @@ public class URLSubsitutionsPanel extends SubstitutionsPanel<List<String>> {
             /** {@inheritDoc} */
             @Override
             public void run() {
-                substitutions = new ArrayList<SubstitutionLabel>();
+                substitutions = new ArrayList<>();
 
                 if (type != null) {
                     for (String sub : type) {

src/com/dmdirc/addons/ui_swing/framemanager/buttonbar/ButtonBar.java

@@ -193,7 +193,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
 
             if (!frame.getChildren().isEmpty()) {
                 final ArrayList<FrameContainer> childList = new ArrayList
-                        <FrameContainer>(frame.getChildren());
+                        <>(frame.getChildren());
                 initButtons(childList);
             }
         }
@@ -271,7 +271,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
                 buttonPanel.add(button);
                 if (!window.getChildren().isEmpty()) {
                     final ArrayList<FrameContainer> childList = new ArrayList
-                            <FrameContainer>(window.getChildren());
+                            <>(window.getChildren());
                     if (sortChildWindows) {
                          Collections.sort(childList,
                                  new FrameContainerComparator());
@@ -290,7 +290,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
         buttonPanel.removeAll();
 
         final ArrayList<FrameContainer> windowList = new
- ArrayList<FrameContainer>(windowManager.getRootWindows());
+ ArrayList<>(windowManager.getRootWindows());
         if (sortRootWindows) {
             Collections.sort(windowList, new FrameContainerComparator());
         }
@@ -595,12 +595,15 @@ public final class ButtonBar implements FrameManager, ActionListener,
     /** {@inheritDoc} */
     @Override
     public void configChanged(final String domain, final String key) {
-        if ("sortrootwindows".equals(key)) {
-            sortRootWindows = controller.getGlobalConfig()
-                    .getOptionBool("ui", "sortrootwindows");
-        } else if ("sortchildwindows".equals(key)) {
-            sortChildWindows = controller.getGlobalConfig()
-                    .getOptionBool("ui", "sortrootwindows");
+        switch (key) {
+            case "sortrootwindows":
+                sortRootWindows = controller.getGlobalConfig()
+                        .getOptionBool("ui", "sortrootwindows");
+                break;
+            case "sortchildwindows":
+                sortChildWindows = controller.getGlobalConfig()
+                        .getOptionBool("ui", "sortrootwindows");
+                break;
         }
         relayout();
     }

src/com/dmdirc/addons/ui_swing/framemanager/ctrltab/CtrlTabWindowManager.java

@@ -76,7 +76,7 @@ public class CtrlTabWindowManager implements SwingWindowListener,
     public CtrlTabWindowManager(final SwingController controller,
             final MainFrame mainFrame,
             final JComponent component) {
-        nodes = new HashMap<Window, TreeViewNode>();
+        nodes = new HashMap<>();
         model = new TreeViewModel(controller, new TreeViewNode(null, null));
         selectionModel = new DefaultTreeSelectionModel();
         treeScroller = new TreeScroller(model, selectionModel, false) {

src/com/dmdirc/addons/ui_swing/framemanager/tree/Tree.java

@@ -93,11 +93,9 @@ public class Tree extends JTree implements MouseMotionListener,
         getInputMap(JComponent.WHEN_FOCUSED).clear();
         getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).clear();
         getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).clear();
-        getSelectionModel().setSelectionMode(
-                TreeSelectionModel.SINGLE_TREE_SELECTION);
+        getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
         setRootVisible(false);
-        setRowHeight(getFontMetrics(
-                UIManager.getFont("Tree.font")).getHeight() + 2);
+        setRowHeight(getFontMetrics(UIManager.getFont("Tree.font")).getHeight() + 2);
         setOpaque(true);
         setBorder(BorderFactory.createEmptyBorder(
                 (int) PlatformDefaults.getUnitValueX("related").getValue(),
@@ -121,8 +119,7 @@ public class Tree extends JTree implements MouseMotionListener,
     /** {@inheritDoc} */
     @Override
     public void scrollRectToVisible(final Rectangle aRect) {
-        final Rectangle rect = new Rectangle(0, aRect.y,
-                aRect.width, aRect.height);
+        final Rectangle rect = new Rectangle(0, aRect.y, aRect.width, aRect.height);
         super.scrollRectToVisible(rect);
     }
 
@@ -163,12 +160,15 @@ public class Tree extends JTree implements MouseMotionListener,
     /** {@inheritDoc} */
     @Override
     public void configChanged(final String domain, final String key) {
-        if ("dragSelection".equals(key)) {
-            dragSelect = config.getOptionBool("treeview", "dragSelection");
-        } else if ("showtreeexpands".equals(key)) {
-            config.getOptionBool(controller.getDomain(), "showtreeexpands");
-            setShowsRootHandles(showHandles);
-            putClientProperty("showHandles", showHandles);
+        switch (key) {
+            case "dragSelection":
+                dragSelect = config.getOptionBool("treeview", "dragSelection");
+                break;
+            case "showtreeexpands":
+                config.getOptionBool(controller.getDomain(), "showtreeexpands");
+                setShowsRootHandles(showHandles);
+                putClientProperty("showHandles", showHandles);
+                break;
         }
     }
 
@@ -268,9 +268,8 @@ public class Tree extends JTree implements MouseMotionListener,
     public void processMouseEvents(final MouseEvent e) {
         final TreePath localPath = getPathForLocation(e.getX(), e.getY());
         if (localPath != null && e.isPopupTrigger()) {
-            final TextFrame frame = controller.getWindowFactory()
-                    .getSwingWindow(((TreeViewNode) localPath.getLastPathComponent())
-                    .getWindow());
+            final TextFrame frame = controller.getWindowFactory().getSwingWindow(
+                    ((TreeViewNode) localPath.getLastPathComponent()).getWindow());
 
             if (frame == null) {
                 return;
@@ -322,24 +321,27 @@ public class Tree extends JTree implements MouseMotionListener,
         final TreeViewNode node = ((TreeViewNodeMenuItem) e.getSource()).
                 getTreeNode();
         int index = getModel().getIndexOfChild(node.getParent(), node);
-        if ("Up".equals(e.getActionCommand())) {
-            if (index == 0) {
-                index = node.getSiblingCount() - 1;
-            } else {
-                index--;
-            }
-        } else if ("Down".equals(e.getActionCommand())) {
-            if (index == (node.getSiblingCount() - 1)) {
-                index = 0;
-            } else {
-                index++;
-            }
-        } else if ("popout".equals(e.getActionCommand())) {
-            controller.getWindowFactory().getSwingWindow(node.getWindow())
-                    .setPopout(true);
-        } else if ("popin".equals(e.getActionCommand())) {
-            controller.getWindowFactory().getSwingWindow(node.getWindow())
-                    .setPopout(false);
+        switch (e.getActionCommand()) {
+            case "Up":
+                if (index == 0) {
+                    index = node.getSiblingCount() - 1;
+                } else {
+                    index--;
+                }
+                break;
+            case "Down":
+                if (index == (node.getSiblingCount() - 1)) {
+                    index = 0;
+                } else {
+                    index++;
+                }
+                break;
+            case "popout":
+                controller.getWindowFactory().getSwingWindow(node.getWindow()).setPopout(true);
+                break;
+            case "popin":
+                controller.getWindowFactory().getSwingWindow(node.getWindow()).setPopout(false);
+                break;
         }
         final TreeViewNode parentNode = (TreeViewNode) node.getParent();
         final TreePath nodePath = new TreePath(node.getPath());

src/com/dmdirc/addons/ui_swing/framemanager/tree/TreeFrameManager.java

@@ -337,8 +337,7 @@ public class TreeFrameManager implements FrameManager,
     @Override
     public void selectionChanged(final TextFrame window) {
         synchronized (nodes) {
-            final Collection<TreeViewNode> collection =
-                    new ArrayList<TreeViewNode>(nodes.values());
+            final Collection<TreeViewNode> collection = new ArrayList<>(nodes.values());
             for (TreeViewNode treeNode : collection) {
                 final NodeLabel label = treeNode.getLabel();
                 label.selectionChanged(window);

src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/WindowMenuFrameManager.java

@@ -301,8 +301,7 @@ public final class WindowMenuFrameManager extends JMenu implements
     /** {@inheritDoc} */
     @Override
     public void selectionChanged(final TextFrame window) {
-        final Collection<SelectionListener> values =
-                new ArrayList<SelectionListener>();
+        final Collection<SelectionListener> values = new ArrayList<>();
         synchronized (menus) {
             synchronized (items) {
                 synchronized (menuItems) {

src/com/dmdirc/addons/ui_swing/textpane/TextPaneCanvas.java

@@ -111,8 +111,8 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
         startLine = 0;
         setDoubleBuffered(true);
         setOpaque(true);
-        textLayouts = new HashMap<TextLayout, LineInfo>();
-        positions = new HashMap<Rectangle, TextLayout>();
+        textLayouts = new HashMap<>();
+        positions = new HashMap<>();
         selection = new LinePosition(-1, -1, -1, -1);
         addMouseListener(this);
         addMouseMotionListener(this);

src/com/dmdirc/addons/ui_web/Client.java

@@ -48,7 +48,7 @@ public class Client {
     private final String ip;
 
     /** An ordered list of events to be sent to the client */
-    private final List<Event> events = new LinkedList<Event>();
+    private final List<Event> events = new LinkedList<>();
 
     /**
      * Creates a new client for the specified controller.
@@ -62,7 +62,7 @@ public class Client {
 
         this.ip = ip;
 
-        final List<Window> added = new LinkedList<Window>();
+        final List<Window> added = new LinkedList<>();
         final List<Window> queued
                 = new LinkedList<Window>(controller.getWindowManager().getWindows());
 
@@ -142,7 +142,7 @@ public class Client {
      */
     public List<Event> retrieveEvents() {
         synchronized (events) {
-            final List<Event> res = new LinkedList<Event>(events);
+            final List<Event> res = new LinkedList<>(events);
             events.clear();
             return res;
         }

src/com/dmdirc/addons/ui_web/uicomponents/WebWindow.java

@@ -98,7 +98,7 @@ public class WebWindow implements Window, IRCDocumentListener,
             return Collections.<String>emptyList();
         }
 
-        final List<String> messages = new ArrayList<String>(document.getNumLines());
+        final List<String> messages = new ArrayList<>(document.getNumLines());
 
         for (int i = 0; i < document.getNumLines(); i++) {
             messages.add(style(document.getStyledLine(i)));

test/com/dmdirc/addons/calc/ParserTest.java

@@ -42,7 +42,7 @@ public class ParserTest {
 
     @Test
     public void testFindTokenType() {
-        final List<TreeToken> tokens = new ArrayList<TreeToken>();
+        final List<TreeToken> tokens = new ArrayList<>();
         tokens.add(new TreeToken(new Token(TokenType.BRACKET_CLOSE, null)));
         tokens.add(new TreeToken(new Token(TokenType.BRACKET_CLOSE, null)));
         tokens.add(new TreeToken(new Token(TokenType.BRACKET_OPEN, null)));
@@ -62,7 +62,7 @@ public class ParserTest {
     public void testParseBracket() throws ParseException {
         final Parser parser = new Parser(null);
 
-        final List<TreeToken> tokens = new ArrayList<TreeToken>();
+        final List<TreeToken> tokens = new ArrayList<>();
         tokens.add(new TreeToken(new Token(TokenType.START, null)));
         tokens.add(new TreeToken(new Token(TokenType.BRACKET_OPEN, null)));
         tokens.add(new TreeToken(new Token(TokenType.NUMBER_INT, null)));
@@ -80,7 +80,7 @@ public class ParserTest {
     public void testParseBracket2() throws ParseException {
         final Parser parser = new Parser(null);
 
-        final List<TreeToken> tokens = new ArrayList<TreeToken>();
+        final List<TreeToken> tokens = new ArrayList<>();
         tokens.add(new TreeToken(new Token(TokenType.START, null)));
         tokens.add(new TreeToken(new Token(TokenType.BRACKET_OPEN, null)));
         tokens.add(new TreeToken(new Token(TokenType.NUMBER_INT, null)));
@@ -104,7 +104,7 @@ public class ParserTest {
     public void testUnmatchedBracket() throws ParseException {
         final Parser parser = new Parser(null);
 
-        final List<TreeToken> tokens = new ArrayList<TreeToken>();
+        final List<TreeToken> tokens = new ArrayList<>();
         tokens.add(new TreeToken(new Token(TokenType.START, null)));
         tokens.add(new TreeToken(new Token(TokenType.NUMBER_INT, null)));
         tokens.add(new TreeToken(new Token(TokenType.BRACKET_CLOSE, null)));
@@ -117,7 +117,7 @@ public class ParserTest {
     public void testParseNumber() {
         final Parser parser = new Parser(null);
 
-        final List<TreeToken> tokens = new ArrayList<TreeToken>();
+        final List<TreeToken> tokens = new ArrayList<>();
         tokens.add(new TreeToken(new Token(TokenType.START, null)));
         tokens.add(new TreeToken(new Token(TokenType.BRACKET_OPEN, null)));
         tokens.add(new TreeToken(new Token(TokenType.NUMBER_INT, null)));
@@ -133,7 +133,7 @@ public class ParserTest {
     public void testParseHidden() {
         final Parser parser = new Parser(null);
 
-        final List<TreeToken> tokens = new ArrayList<TreeToken>();
+        final List<TreeToken> tokens = new ArrayList<>();
         tokens.add(new TreeToken(new Token(TokenType.START, null)));
         tokens.add(new TreeToken(new Token(TokenType.BRACKET_OPEN, null)));
         tokens.add(new TreeToken(new Token(TokenType.NUMBER_INT, null)));
@@ -153,7 +153,7 @@ public class ParserTest {
     public void testParseUnaryOps() {
         final Parser parser = new Parser(null);
 
-        final List<TreeToken> tokens = new ArrayList<TreeToken>();
+        final List<TreeToken> tokens = new ArrayList<>();
         tokens.add(new TreeToken(new Token(TokenType.START, null)));
         tokens.add(new TreeToken(new Token(TokenType.MOD_NEGATIVE, null)));
         tokens.add(new TreeToken(new Token(TokenType.NUMBER_INT, null)));
@@ -174,7 +174,7 @@ public class ParserTest {
     public void testParseBinaryOps() {
         final Parser parser = new Parser(null);
 
-        final List<TreeToken> tokens = new ArrayList<TreeToken>();
+        final List<TreeToken> tokens = new ArrayList<>();
         tokens.add(new TreeToken(new Token(TokenType.START, null)));
         tokens.add(new TreeToken(new Token(TokenType.NUMBER_INT, "15")));
         tokens.add(new TreeToken(new Token(TokenType.OP_MINUS, null)));

test/com/dmdirc/addons/osd/OsdPolicyTest.java

@@ -34,7 +34,7 @@ public class OsdPolicyTest {
 
     @Before
     public void setup() {
-        final ArrayList<OsdWindow> windows = new ArrayList<OsdWindow>();
+        final ArrayList<OsdWindow> windows = new ArrayList<>();
 
         OsdWindow window = mock(OsdWindow.class);
         when(window.getY()).thenReturn(75);

test/com/dmdirc/addons/ui_swing/dialogs/profiles/ProfileNameValidatorTest.java

@@ -43,7 +43,7 @@ public class ProfileNameValidatorTest {
         when(other.getName()).thenReturn("other");
         final Profile selected = mock(Profile.class);
         when(selected.getName()).thenReturn("selected");
-        final List<Profile> profiles = new ArrayList<Profile>();
+        final List<Profile> profiles = new ArrayList<>();
         profiles.add(selected);
         profiles.add(other);
         ProfileNameValidator instance = new ProfileNameValidator(profiles, selected);
@@ -59,7 +59,7 @@ public class ProfileNameValidatorTest {
         when(other.getName()).thenReturn("other");
         final Profile selected = mock(Profile.class);
         when(selected.getName()).thenReturn("selected");
-        final List<Profile> profiles = new ArrayList<Profile>();
+        final List<Profile> profiles = new ArrayList<>();
         profiles.add(selected);
         profiles.add(other);
         ProfileNameValidator instance = new ProfileNameValidator(profiles, selected);
@@ -75,7 +75,7 @@ public class ProfileNameValidatorTest {
         when(other.getName()).thenReturn("other");
         final Profile selected = mock(Profile.class);
         when(selected.getName()).thenReturn("selected");
-        final List<Profile> profiles = new ArrayList<Profile>();
+        final List<Profile> profiles = new ArrayList<>();
         profiles.add(selected);
         profiles.add(other);
         ProfileNameValidator instance = new ProfileNameValidator(profiles, selected);