Lambdas.

dcc/src/com/dmdirc/addons/dcc/DCCCommand.java

@@ -42,18 +42,17 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.ui.messages.sink.MessageSinkManager;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.messages.ColourManagerFactory;
+import com.dmdirc.ui.messages.sink.MessageSinkManager;
 import com.dmdirc.util.URLBuilder;
 
 import java.awt.Window;
 import java.io.File;
-import java.util.concurrent.Callable;
 
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -131,20 +130,16 @@ public class DCCCommand extends Command implements IntelligentCommand {
             if (parser.isValidChannelName(target)
                     || parser.getStringConverter().equalsIgnoreCase(target,
                             myNickname)) {
-                new Thread(new Runnable() {
-
-                    @Override
-                    public void run() {
-                        if (parser.getStringConverter().equalsIgnoreCase(target,
-                                myNickname)) {
-                            JOptionPane.showMessageDialog(null,
-                                    "You can't DCC yourself.", "DCC Error",
-                                    JOptionPane.ERROR_MESSAGE);
-                        } else {
-                            JOptionPane.showMessageDialog(null,
-                                    "You can't DCC a channel.", "DCC Error",
-                                    JOptionPane.ERROR_MESSAGE);
-                        }
+                new Thread(() -> {
+                    if (parser.getStringConverter().equalsIgnoreCase(target,
+                            myNickname)) {
+                        JOptionPane.showMessageDialog(null,
+                                "You can't DCC yourself.", "DCC Error",
+                                JOptionPane.ERROR_MESSAGE);
+                    } else {
+                        JOptionPane.showMessageDialog(null,
+                                "You can't DCC a channel.", "DCC Error",
+                                JOptionPane.ERROR_MESSAGE);
                     }
                 }, "DCC-Error-Message").start();
                 return;
@@ -220,76 +215,69 @@ public class DCCCommand extends Command implements IntelligentCommand {
             final Connection connection, final boolean isSilent, final String filename) {
         // New thread to ask the user what file to send
         final File givenFile = new File(filename);
-        final File selectedFile = UIUtilities.invokeAndWait(new Callable<File>() {
-            @Override
-            public File call() {
-                final JFileChooser jc = givenFile.exists()
-                        ? KFileChooser.getFileChooser(origin.getConfigManager(),
-                                myPlugin, givenFile)
-                        : KFileChooser.getFileChooser(origin.getConfigManager(),
-                                myPlugin);
-                final int result = showFileChooser(givenFile, target, jc);
+        final File selectedFile = UIUtilities.invokeAndWait(() -> {
+            final JFileChooser jc = givenFile.exists()
+                    ? KFileChooser.getFileChooser(origin.getConfigManager(),
+                            myPlugin, givenFile)
+                    : KFileChooser.getFileChooser(origin.getConfigManager(),
+                            myPlugin);
+            final int result = showFileChooser(givenFile, target, jc);
 
-                if (result != JFileChooser.APPROVE_OPTION
-                        || !handleInvalidItems(jc)) {
-                    return null;
-                }
-                return jc.getSelectedFile();
+            if (result != JFileChooser.APPROVE_OPTION
+                    || !handleInvalidItems(jc)) {
+                return null;
             }
+            return jc.getSelectedFile();
         });
         if (selectedFile == null) {
             return;
         }
-        new Thread(new Runnable() {
-
-            @Override
-            public void run() {
-                final DCCTransfer send = new DCCTransfer(origin
-                        .getConfigManager().getOptionInt(myPlugin.getDomain(),
-                                "send.blocksize"));
-                send.setTurbo(origin.getConfigManager().getOptionBool(
-                        myPlugin.getDomain(), "send.forceturbo"));
-                send.setType(DCCTransfer.TransferType.SEND);
+        new Thread(() -> {
+            final DCCTransfer send = new DCCTransfer(origin
+                    .getConfigManager().getOptionInt(myPlugin.getDomain(),
+                            "send.blocksize"));
+            send.setTurbo(origin.getConfigManager().getOptionBool(
+                    myPlugin.getDomain(), "send.forceturbo"));
+            send.setType(DCCTransfer.TransferType.SEND);
 
-                eventBus.publish(new DccSendRequestEvent(connection, target, selectedFile.
-                        getAbsolutePath()));
+            eventBus.publish(new DccSendRequestEvent(connection, target, selectedFile.
+                    getAbsolutePath()));
 
-                sendLine(origin, isSilent, FORMAT_OUTPUT,
-                        "Starting DCC Send with: " + target);
+            sendLine(origin, isSilent, FORMAT_OUTPUT,
+                    "Starting DCC Send with: " + target);
 
-                send.setFileName(selectedFile.getAbsolutePath());
-                send.setFileSize(selectedFile.length());
+            send.setFileName(selectedFile.getAbsolutePath());
+            send.setFileSize(selectedFile.length());
 
-                if (origin.getConfigManager().getOptionBool(
-                        myPlugin.getDomain(), "send.reverse")) {
-                    final Parser parser = connection.getParser();
+            if (origin.getConfigManager().getOptionBool(
+                    myPlugin.getDomain(), "send.reverse")) {
+                final Parser parser = connection.getParser();
+                final TransferContainer container = new TransferContainer(myPlugin, send,
+                        origin.getConfigManager(), colourManagerFactory, "Send: " + target,
+                        target, connection, urlBuilder, eventBus);
+                windowManager.addWindow(myPlugin.getContainer(), container);
+                parser.sendCTCP(target, "DCC", "SEND \""
+                        + selectedFile.getName() + "\" "
+                        + DCC.ipToLong(myPlugin.getListenIP(parser))
+                        + " 0 " + send.getFileSize() + " "
+                        + send.makeToken()
+                        + (send.isTurbo() ? " T" : ""));
+            } else {
+                final Parser parser = connection.getParser();
+                if (myPlugin.listen(send)) {
                     final TransferContainer container = new TransferContainer(myPlugin, send,
-                            origin.getConfigManager(), colourManagerFactory, "Send: " + target,
-                            target, connection, urlBuilder, eventBus);
+                            origin.getConfigManager(), colourManagerFactory, "*Send: "
+                            + target, target, connection, urlBuilder, eventBus);
                     windowManager.addWindow(myPlugin.getContainer(), container);
                     parser.sendCTCP(target, "DCC", "SEND \""
                             + selectedFile.getName() + "\" "
                             + DCC.ipToLong(myPlugin.getListenIP(parser))
-                            + " 0 " + send.getFileSize() + " "
-                            + send.makeToken()
+                            + " " + send.getPort() + " " + send.getFileSize()
                             + (send.isTurbo() ? " T" : ""));
                 } else {
-                    final Parser parser = connection.getParser();
-                    if (myPlugin.listen(send)) {
-                        final TransferContainer container = new TransferContainer(myPlugin, send,
-                                origin.getConfigManager(), colourManagerFactory, "*Send: "
-                                + target, target, connection, urlBuilder, eventBus);
-                        windowManager.addWindow(myPlugin.getContainer(), container);
-                        parser.sendCTCP(target, "DCC", "SEND \""
-                                + selectedFile.getName() + "\" "
-                                + DCC.ipToLong(myPlugin.getListenIP(parser))
-                                + " " + send.getPort() + " " + send.getFileSize()
-                                + (send.isTurbo() ? " T" : ""));
-                    } else {
-                        sendLine(origin, isSilent, "DCCSendError",
-                                "Unable to start dcc send with " + target
-                                + " - unable to create listen socket");
-                    }
+                    sendLine(origin, isSilent, "DCCSendError",
+                            "Unable to start dcc send with " + target
+                            + " - unable to create listen socket");
                 }
             }
         }, "openFileThread").start();

dcc/src/com/dmdirc/addons/dcc/DCCManager.java

@@ -205,68 +205,64 @@ public class DCCManager {
     public void saveFile(final String nickname, final DCCTransfer send,
             final Parser parser, final boolean reverse, final String token) {
         // New thread to ask the user where to save in to stop us locking the UI
-        new Thread(new Runnable() {
-
-            @Override
-            public void run() {
-                final JFileChooser jc = KFileChooser.getFileChooser(config,
-                        DCCManager.this,
-                        config.getOption(getDomain(), "receive.savelocation"));
-                final int result;
-                if (config.getOptionBool(getDomain(), "receive.autoaccept")) {
-                    result = JFileChooser.APPROVE_OPTION;
-                } else {
-                    result = showFileChooser(send, jc);
-                }
-                if (result != JFileChooser.APPROVE_OPTION) {
-                    return;
-                }
-                send.setFileName(jc.getSelectedFile().getPath());
-                if (!handleExists(send, jc, nickname, parser, reverse, token)) {
-                    return;
-                }
-                final boolean resume = handleResume(jc);
-                if (reverse && !token.isEmpty()) {
-                    final TransferContainer container = new TransferContainer(DCCManager.this, send,
-                            config, colourManagerFactory, "*Receive: " + nickname, nickname, null,
-                            urlBuilder, eventBus);
-                    windowManager.addWindow(getContainer(), container);
-                    send.setToken(token);
-                    if (resume) {
-                        if (config.getOptionBool(getDomain(),
-                                "receive.reverse.sendtoken")) {
-                            parser.sendCTCP(nickname, "DCC", "RESUME "
-                                    + send.getShortFileName() + " 0 "
-                                    + jc.getSelectedFile().length() + " "
-                                    + token);
-                        } else {
-                            parser.sendCTCP(nickname, "DCC", "RESUME "
-                                    + send.getShortFileName() + " 0 "
-                                    + jc.getSelectedFile().length());
-                        }
+        new Thread(() -> {
+            final JFileChooser jc = KFileChooser.getFileChooser(config,
+                    DCCManager.this,
+                    config.getOption(getDomain(), "receive.savelocation"));
+            final int result;
+            if (config.getOptionBool(getDomain(), "receive.autoaccept")) {
+                result = JFileChooser.APPROVE_OPTION;
+            } else {
+                result = showFileChooser(send, jc);
+            }
+            if (result != JFileChooser.APPROVE_OPTION) {
+                return;
+            }
+            send.setFileName(jc.getSelectedFile().getPath());
+            if (!handleExists(send, jc, nickname, parser, reverse, token)) {
+                return;
+            }
+            final boolean resume = handleResume(jc);
+            if (reverse && !token.isEmpty()) {
+                final TransferContainer container1 = new TransferContainer(DCCManager.this, send,
+                        config, colourManagerFactory, "*Receive: " + nickname, nickname, null,
+                        urlBuilder, eventBus);
+                windowManager.addWindow(getContainer(), container1);
+                send.setToken(token);
+                if (resume) {
+                    if (config.getOptionBool(getDomain(),
+                            "receive.reverse.sendtoken")) {
+                        parser.sendCTCP(nickname, "DCC", "RESUME "
+                                + send.getShortFileName() + " 0 "
+                                + jc.getSelectedFile().length() + " "
+                                + token);
                     } else {
-                        if (listen(send)) {
-                            parser.sendCTCP(nickname, "DCC", "SEND "
-                                    + send.getShortFileName() + " "
-                                    + DCC.ipToLong(getListenIP(parser))
-                                    + " " + send.getPort() + " "
-                                    + send.getFileSize() + " " + token);
-                        }
+                        parser.sendCTCP(nickname, "DCC", "RESUME "
+                                + send.getShortFileName() + " 0 "
+                                + jc.getSelectedFile().length());
                     }
                 } else {
-                    final TransferContainer container = new TransferContainer(DCCManager.this, send,
-                            config, colourManagerFactory, "Receive: " + nickname, nickname, null,
-                            urlBuilder, eventBus);
-                    windowManager.addWindow(getContainer(), container);
-                    if (resume) {
-                        parser.sendCTCP(nickname, "DCC", "RESUME "
+                    if (listen(send)) {
+                        parser.sendCTCP(nickname, "DCC", "SEND "
                                 + send.getShortFileName() + " "
-                                + send.getPort() + " "
-                                + jc.getSelectedFile().length());
-                    } else {
-                        send.connect();
+                                + DCC.ipToLong(getListenIP(parser))
+                                + " " + send.getPort() + " "
+                                + send.getFileSize() + " " + token);
                     }
                 }
+            } else {
+                final TransferContainer container1 = new TransferContainer(DCCManager.this, send,
+                        config, colourManagerFactory, "Receive: " + nickname, nickname, null,
+                        urlBuilder, eventBus);
+                windowManager.addWindow(getContainer(), container1);
+                if (resume) {
+                    parser.sendCTCP(nickname, "DCC", "RESUME "
+                            + send.getShortFileName() + " "
+                            + send.getPort() + " "
+                            + jc.getSelectedFile().length());
+                } else {
+                    send.connect();
+                }
             }
         }, "saveFileThread: " + send.getShortFileName()).start();
     }

dcc/src/com/dmdirc/addons/dcc/TransferContainer.java

@@ -313,14 +313,10 @@ public class TransferContainer extends FrameContainer implements
             //that this send is for.
             if (connection.getParser().getStringConverter().equalsIgnoreCase(
                     otherNickname, myNickname)) {
-                final Thread errorThread = new Thread(new Runnable() {
-
-                    @Override
-                    public void run() {
-                        JOptionPane.showMessageDialog(null,
-                                "You can't DCC yourself.", "DCC Error",
-                                JOptionPane.ERROR_MESSAGE);
-                    }
+                final Thread errorThread = new Thread(() -> {
+                    JOptionPane.showMessageDialog(null,
+                            "You can't DCC yourself.", "DCC Error",
+                            JOptionPane.ERROR_MESSAGE);
                 }, "DCC-Error-Message");
                 errorThread.start();
             } else {

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

@@ -35,7 +35,6 @@ import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.messages.ColourManager;
 
 import java.awt.Window;
-import java.util.concurrent.Callable;
 
 import dagger.ObjectGraph;
 
@@ -92,15 +91,9 @@ public class NickColourPlugin extends BasePlugin {
         final PreferencesCategory colours = new PluginPreferencesCategory(
                 pluginInfo, "Colours",
                 "Set colours for specific nicknames.", UIUtilities.invokeAndWait(
-                        new Callable<NickColourPanel>() {
-
-                            @Override
-                            public NickColourPanel call() {
-                                return new NickColourPanel(mainWindow, iconManager, colourManager,
-                                        manager.getIdentity(), manager.getConfigManager(),
-                                        pluginInfo.getDomain());
-                            }
-                        }));
+                () -> new NickColourPanel(mainWindow, iconManager, colourManager,
+                        manager.getIdentity(), manager.getConfigManager(),
+                        pluginInfo.getDomain())));
 
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 "ui", "shownickcoloursintext", "Show colours in text area",

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

@@ -82,17 +82,14 @@ public class NotifyMyAndroidCommand extends Command {
                 origin.getConfigManager().getOption(configDomain, "apikey"),
                 origin.getConfigManager().getOption(configDomain, "application"));
 
-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    client.notify(parts[0], parts[1]);
-                    sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Notification sent");
-                } catch (IOException ex) {
-                    LOG.info("Exception when trying to notify NMA", ex);
-                    sendLine(origin, args.isSilent(), FORMAT_ERROR, "Unable to send: " + ex.
-                            getMessage());
-                }
+        new Thread(() -> {
+            try {
+                client.notify(parts[0], parts[1]);
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Notification sent");
+            } catch (IOException ex) {
+                LOG.info("Exception when trying to notify NMA", ex);
+                sendLine(origin, args.isSilent(), FORMAT_ERROR, "Unable to send: " + ex.
+                        getMessage());
             }
         }, "NMA Thread").start();
     }

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

@@ -29,8 +29,6 @@ import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 
-import java.util.concurrent.Callable;
-
 import dagger.ObjectGraph;
 
 /**
@@ -76,15 +74,9 @@ public class NotificationsPlugin extends BaseCommandPlugin {
     @Override
     public void showConfig(final PreferencesDialogModel manager) {
         final NotificationConfig configPanel = UIUtilities.invokeAndWait(
-                new Callable<NotificationConfig>() {
-
-                    @Override
-                    public NotificationConfig call() {
-                        return new NotificationConfig(manager.getIdentity(), pluginInfo.getDomain(),
-                                manager.getConfigManager().getOptionList(pluginInfo.getDomain(),
-                                        "methodOrder"));
-                    }
-                });
+                () -> new NotificationConfig(manager.getIdentity(), pluginInfo.getDomain(),
+                        manager.getConfigManager().getOptionList(pluginInfo.getDomain(),
+                                "methodOrder")));
 
         final PreferencesCategory category = new PluginPreferencesCategory(
                 pluginInfo, "Notifications", "", "category-notifications",

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

@@ -163,20 +163,12 @@ public class ConfigPanel extends JPanel implements PreferencesInterface, KeyList
         }
 
         final String text = manager.doSubstitution(
-                UIUtilities.invokeAndWait(new Callable<String>() {
-                    @Override
-                    public String call() {
-                        return textfield.getText();
-                    }
-                }), source);
-        SwingUtilities.invokeLater(new Runnable() {
-            @Override
-            public void run() {
-                preview.setText("Preview:\n" + text);
-                preview.repaint();
-                previewPanel.revalidate();
-                revalidate();
-            }
+                UIUtilities.invokeAndWait((Callable<String>) textfield::getText), source);
+        SwingUtilities.invokeLater(() -> {
+            preview.setText("Preview:\n" + text);
+            preview.repaint();
+            previewPanel.revalidate();
+            revalidate();
         });
     }
 

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

@@ -29,8 +29,6 @@ import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 
-import java.util.concurrent.Callable;
-
 import dagger.ObjectGraph;
 
 /**
@@ -78,14 +76,9 @@ public class NowPlayingPlugin extends BaseCommandPlugin {
     @Override
     public void showConfig(final PreferencesDialogModel manager) {
         final ConfigPanel configPanel = UIUtilities.invokeAndWait(
-                new Callable<ConfigPanel>() {
-                    @Override
-                    public ConfigPanel call() {
-                        return new ConfigPanel(nowplayingmanager, manager.getConfigManager(),
-                                manager.getIdentity(), domain,
-                                nowplayingmanager.getSettings());
-                    }
-                });
+                () -> new ConfigPanel(nowplayingmanager, manager.getConfigManager(),
+                        manager.getIdentity(), domain,
+                        nowplayingmanager.getSettings()));
 
         final PreferencesCategory category = new PluginPreferencesCategory(
                 pluginInfo, "Now Playing",

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

@@ -28,6 +28,7 @@ import com.dmdirc.addons.ui_swing.components.substitutions.SubstitutionsPanel;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import javax.swing.SwingUtilities;
 
@@ -59,21 +60,16 @@ public class NowPlayingSubsitutionPanel extends SubstitutionsPanel<List<String>>
 
     @Override
     public void setType(final List<String> type) {
-        SwingUtilities.invokeLater(new Runnable() {
+        SwingUtilities.invokeLater(() -> {
+            substitutions = new ArrayList<>();
 
-            @Override
-            public void run() {
-                substitutions = new ArrayList<>();
-
-                if (type != null) {
-                    for (String sub : type) {
-                        substitutions.add(new SubstitutionLabel(new Substitution(sub,
-                                sub)));
-                    }
-                }
-
-                layoutComponents();
+            if (type != null) {
+                substitutions.addAll(type.stream()
+                        .map(sub -> new SubstitutionLabel(new Substitution(sub, sub)))
+                        .collect(Collectors.toList()));
             }
+
+            layoutComponents();
         });
     }