Lambda-ise some things.

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

@@ -50,11 +50,7 @@ public class EdtHandlerInvocation extends ReflectiveHandlerInvocation {
     @Override
     protected void invokeHandler(final Object message, final Object listener,
             final Method handler) {
-        UIUtilities.invokeAndWait(new Runnable() {
-            @Override
-            public void run() {
-                EdtHandlerInvocation.super.invokeHandler(message, listener, handler);
-            }
-        });
+        UIUtilities.invokeAndWait(
+                () -> EdtHandlerInvocation.super.invokeHandler(message, listener, handler));
     }
 }

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

@@ -88,13 +88,7 @@ public class SwingController extends BaseCommandPlugin implements UIController {
 
         swingManager.load();
 
-        UIUtilities.invokeAndWait(new Runnable() {
-
-            @Override
-            public void run() {
-                getMainFrame().setVisible(true);
-            }
-        });
+        UIUtilities.invokeAndWait(() -> getMainFrame().setVisible(true));
 
         super.onLoad();
     }

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

@@ -95,44 +95,40 @@ public class SwingUIInitialiser {
      * Initialises the global UI settings for the Swing UI.
      */
     private void initUISettings() {
-        UIUtilities.invokeAndWait(new Runnable() {
-
-            @Override
-            public void run() {
-                // This will do nothing on non OS X Systems
-                if (Apple.isApple()) {
-                    apple.setUISettings();
-                    apple.setListener();
-                }
-
-                final Font defaultFont = new Font(Font.DIALOG, Font.TRUETYPE_FONT, 12);
-                if (UIManager.getFont("TextField.font") == null) {
-                    UIManager.put("TextField.font", defaultFont);
-                }
-                if (UIManager.getFont("TextPane.font") == null) {
-                    UIManager.put("TextPane.font", defaultFont);
-                }
-                addonConfig.setOption("ui", "textPaneFontName",
-                        UIManager.getFont("TextPane.font").getFamily());
-                addonConfig.setOption("ui", "textPaneFontSize",
-                        UIManager.getFont("TextPane.font").getSize());
-
-                try {
-                    UIUtilities.initUISettings();
-                    UIManager.setLookAndFeel(UIUtilities.getLookAndFeel(
-                            globalConfig.getOption("ui", "lookandfeel")));
-                    UIUtilities.setUIFont(new Font(globalConfig.getOption("ui", "textPaneFontName"),
-                            Font.PLAIN, 12));
-                } catch (UnsupportedOperationException | UnsupportedLookAndFeelException |
-                        IllegalAccessException | InstantiationException | ClassNotFoundException ex) {
-                    eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, ex,
-                            "Unable to set UI Settings", ""));
-                }
-
-                if ("Metal".equals(UIManager.getLookAndFeel().getName())
-                        || Apple.isAppleUI()) {
-                    PlatformDefaults.setPlatform(PlatformDefaults.WINDOWS_XP);
-                }
+        UIUtilities.invokeAndWait(() -> {
+            // This will do nothing on non OS X Systems
+            if (Apple.isApple()) {
+                apple.setUISettings();
+                apple.setListener();
+            }
+
+            final Font defaultFont = new Font(Font.DIALOG, Font.TRUETYPE_FONT, 12);
+            if (UIManager.getFont("TextField.font") == null) {
+                UIManager.put("TextField.font", defaultFont);
+            }
+            if (UIManager.getFont("TextPane.font") == null) {
+                UIManager.put("TextPane.font", defaultFont);
+            }
+            addonConfig.setOption("ui", "textPaneFontName",
+                    UIManager.getFont("TextPane.font").getFamily());
+            addonConfig.setOption("ui", "textPaneFontSize",
+                    UIManager.getFont("TextPane.font").getSize());
+
+            try {
+                UIUtilities.initUISettings();
+                UIManager.setLookAndFeel(UIUtilities.getLookAndFeel(
+                        globalConfig.getOption("ui", "lookandfeel")));
+                UIUtilities.setUIFont(new Font(globalConfig.getOption("ui", "textPaneFontName"),
+                        Font.PLAIN, 12));
+            } catch (UnsupportedOperationException | UnsupportedLookAndFeelException |
+                    IllegalAccessException | InstantiationException | ClassNotFoundException ex) {
+                eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, ex,
+                        "Unable to set UI Settings", ""));
+            }
+
+            if ("Metal".equals(UIManager.getLookAndFeel().getName())
+                    || Apple.isAppleUI()) {
+                PlatformDefaults.setPlatform(PlatformDefaults.WINDOWS_XP);
             }
         });
     }
@@ -141,14 +137,8 @@ public class SwingUIInitialiser {
      * Installs the dialog key listener.
      */
     private void installKeyListener() {
-        UIUtilities.invokeAndWait(new Runnable() {
-
-            @Override
-            public void run() {
-                KeyboardFocusManager.getCurrentKeyboardFocusManager()
-                        .addKeyEventDispatcher(dialogKeyListener);
-            }
-        });
+        UIUtilities.invokeAndWait(() -> KeyboardFocusManager.getCurrentKeyboardFocusManager()
+                .addKeyEventDispatcher(dialogKeyListener));
     }
 
     /**
@@ -163,13 +153,8 @@ public class SwingUIInitialiser {
      * Installs the DMDirc event queue.
      */
     private void installEventQueue() {
-        UIUtilities.invokeAndWait(new Runnable() {
-
-            @Override
-            public void run() {
-                Toolkit.getDefaultToolkit().getSystemEventQueue().push(eventQueue);
-            }
-        });
+        UIUtilities.invokeAndWait(
+                () -> Toolkit.getDefaultToolkit().getSystemEventQueue().push(eventQueue));
     }
 
     /**

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

@@ -199,14 +199,10 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
     }
 
     private void saveSplitPanePosition() {
-        UIUtilities.invokeAndWait(new Runnable() {
-
-            @Override
-            public void run() {
-                if (getContainer().getConfigManager().getOptionInt("ui",
-                        "channelSplitPanePosition") != nicklist.getWidth()) {
-                    identity.setOption("ui", "channelSplitPanePosition", nicklist.getWidth());
-                }
+        UIUtilities.invokeAndWait(() -> {
+            if (getContainer().getConfigManager().getOptionInt("ui",
+                    "channelSplitPanePosition") != nicklist.getWidth()) {
+                identity.setOption("ui", "channelSplitPanePosition", nicklist.getWidth());
             }
         });
     }

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/about/LicenceLoader.java

@@ -118,27 +118,16 @@ public class LicenceLoader extends LoggingSwingWorker<Void, Void> {
 
     private void addLicensesToNode(final Map<String, InputStream> licences,
             final DefaultMutableTreeNode root) {
-        UIUtilities.invokeAndWait(new Runnable() {
-
-            @Override
-            public void run() {
-                model.insertNodeInto(root, (MutableTreeNode) model.
-                        getRoot(), model.getChildCount(model.getRoot()));
-            }
-        });
+        UIUtilities.invokeAndWait(() -> model.insertNodeInto(root,
+                (MutableTreeNode) model.getRoot(), model.getChildCount(model.getRoot())));
         for (Entry<String, InputStream> entry : licences.entrySet()) {
             final Licence licence = createLicence(entry);
             if (licence == null) {
                 continue;
             }
-            UIUtilities.invokeAndWait(new Runnable() {
-
-                @Override
-                public void run() {
-                    model.insertNodeInto(new DefaultMutableTreeNode(licence), root,
-                            model.getChildCount(root));
-                }
-            });
+            UIUtilities.invokeAndWait(
+                    () -> model.insertNodeInto(new DefaultMutableTreeNode(licence), root,
+                            model.getChildCount(root)));
         }
     }
 

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

@@ -160,40 +160,36 @@ public class CategoryPanel extends JPanel {
 
     private void categoryLoaded(final PreferencesCategory category) {
         if (this.category == category) {
-            UIUtilities.invokeAndWait(new Runnable() {
-
-                @Override
-                public void run() {
-                    final JPanel panel = panels.get(category);
-                    scrollPane.setViewportView(panel);
-                    //Hack around mig bug
-                    panel.invalidate();
-                    panel.validate();
-                    for (final Component component : panel.getComponents()) {
-                        if (component instanceof JPanel) {
-                            component.invalidate();
-                            component.validate();
-                        }
+            UIUtilities.invokeAndWait(() -> {
+                final JPanel panel = panels.get(category);
+                scrollPane.setViewportView(panel);
+                //Hack around mig bug
+                panel.invalidate();
+                panel.validate();
+                for (final Component component : panel.getComponents()) {
+                    if (component instanceof JPanel) {
+                        component.invalidate();
+                        component.validate();
                     }
-                    //And for good measure, hack the crap out of it some more :(
-                    SwingUtilities.invokeLater(new Runnable() {
-                        @Override
-                        public void run() {
-                            panel.invalidate();
-                            panel.validate();
-                            for (final Component component : panel.getComponents()) {
-                                if (component instanceof JPanel) {
-                                    component.invalidate();
-                                    component.validate();
-                                }
+                }
+                //And for good measure, hack the crap out of it some more :(
+                SwingUtilities.invokeLater(new Runnable() {
+                    @Override
+                    public void run() {
+                        panel.invalidate();
+                        panel.validate();
+                        for (final Component component : panel.getComponents()) {
+                            if (component instanceof JPanel) {
+                                component.invalidate();
+                                component.validate();
                             }
                         }
-                    });
-                    if (category == null) {
-                        title.setText("Preferences");
-                    } else {
-                        title.setText(category.getPath());
                     }
+                });
+                if (category == null) {
+                    title.setText("Preferences");
+                } else {
+                    title.setText(category.getPath());
                 }
             });
         }
@@ -216,12 +212,7 @@ public class CategoryPanel extends JPanel {
         if (panels.containsKey(category)) {
             categoryLoaded(category);
         } else {
-            UIUtilities.invokeAndWait(new Runnable() {
-                @Override
-                public void run() {
-                    scrollPane.setViewportView(loading);
-                }
-            });
+            UIUtilities.invokeAndWait(() -> scrollPane.setViewportView(loading));
 
             worker = new PrefsCategoryLoader(factory, eventBus, this, category);
             worker.execute();
@@ -234,13 +225,7 @@ public class CategoryPanel extends JPanel {
      * @param b Loading state
      */
     public void setWaiting(final boolean b) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                scrollPane.setViewportView(waitingCategory);
-            }
-        });
+        UIUtilities.invokeLater(() -> scrollPane.setViewportView(waitingCategory));
     }
 
     /**

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

@@ -34,7 +34,6 @@ import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
 
-import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 
 import javax.swing.BorderFactory;
@@ -89,13 +88,10 @@ public class PrefsCategoryLoader extends LoggingSwingWorker<JPanel, Object> {
         this.categoryPanel = categoryPanel;
         this.category = category;
 
-        UIUtilities.invokeAndWait(new Runnable() {
-            @Override
-            public void run() {
-                errorCategory = new JPanel(new MigLayout("fillx"));
-                errorCategory.add(new TextLabel(
-                        "There was an error loading this category."));
-            }
+        UIUtilities.invokeAndWait(() -> {
+            errorCategory = new JPanel(new MigLayout("fillx"));
+            errorCategory.add(new TextLabel(
+                    "There was an error loading this category."));
         });
     }
 
@@ -139,14 +135,8 @@ public class PrefsCategoryLoader extends LoggingSwingWorker<JPanel, Object> {
             final JPanel panel) {
 
         if (!category.getDescription().isEmpty()) {
-            UIUtilities.invokeAndWait(new Runnable() {
-
-                @Override
-                public void run() {
-                    panel.add(new TextLabel(category.getDescription()), "span, "
-                            + "growx, pushx, wrap 2*unrel");
-                }
-            });
+            UIUtilities.invokeAndWait(() -> panel.add(new TextLabel(category.getDescription()),
+                    "span, growx, pushx, wrap 2*unrel"));
         }
 
         for (PreferencesCategory child : category.getSubcats()) {
@@ -192,16 +182,11 @@ public class PrefsCategoryLoader extends LoggingSwingWorker<JPanel, Object> {
 
         final TextLabel label = new TextLabel(setting.getTitle() + ": ", false);
 
-        final JComponent option = UIUtilities.invokeAndWait(
-                new Callable<JComponent>() {
-
-                    @Override
-                    public JComponent call() {
-                        final JComponent option = factory.getComponent(setting);
-                        option.setToolTipText(null);
-                        return option;
-                    }
-                });
+        final JComponent option = UIUtilities.invokeAndWait(() -> {
+            final JComponent option1 = factory.getComponent(setting);
+            option1.setToolTipText(null);
+            return option1;
+        });
 
         categoryPanel.getToolTipPanel().registerTooltipHandler(label,
                 getTooltipText(setting, categoryPanel));
@@ -252,21 +237,17 @@ public class PrefsCategoryLoader extends LoggingSwingWorker<JPanel, Object> {
      */
     private void addInlineCategory(final PreferencesCategory category,
             final JPanel parent) {
-        final JPanel panel = UIUtilities.invokeAndWait(
-                new Callable<JPanel>() {
-                    @Override
-                    public JPanel call() {
-                        final JPanel panel = new NoRemovePanel(new MigLayout(
-                                        "fillx, gap unrel, wrap 2, "
-                                        + "hidemode 3, pack, wmax 470-" + leftPadding + "-"
-                                        + rightPadding + "-2*"
-                                        + padding));
-                        panel.setName(category.getPath());
-                        panel.setBorder(BorderFactory.createTitledBorder(UIManager.
-                                        getBorder("TitledBorder.border"), category.getTitle()));
-                        return panel;
-                    }
-                });
+        final JPanel panel = UIUtilities.invokeAndWait(() -> {
+            final JPanel panel1 = new NoRemovePanel(new MigLayout(
+                            "fillx, gap unrel, wrap 2, "
+                            + "hidemode 3, pack, wmax 470-" + leftPadding + '-'
+                            + rightPadding + "-2*"
+                            + padding));
+            panel1.setName(category.getPath());
+            panel1.setBorder(BorderFactory.createTitledBorder(UIManager.
+                    getBorder("TitledBorder.border"), category.getTitle()));
+            return panel1;
+        });
 
         parent.add(panel, "span, growx, pushx, wrap");
 
@@ -280,18 +261,14 @@ public class PrefsCategoryLoader extends LoggingSwingWorker<JPanel, Object> {
      * @param category   The category to be added
      */
     private JPanel addCategory(final PreferencesCategory category) {
-        final JPanel panel = UIUtilities.invokeAndWait(
-                new Callable<JPanel>() {
-                    @Override
-                    public JPanel call() {
-                        final JPanel panel = new NoRemovePanel(
-                                new MigLayout("fillx, gap unrel, wrap 2, pack, "
-                                        + "hidemode 3, wmax 470-"
-                                        + leftPadding + "-" + rightPadding + "-2*" + padding));
-                        panel.setName(category.getPath());
-                        return panel;
-                    }
-                });
+        final JPanel panel = UIUtilities.invokeAndWait(() -> {
+            final JPanel panel1 = new NoRemovePanel(
+                    new MigLayout("fillx, gap unrel, wrap 2, pack, "
+                            + "hidemode 3, wmax 470-"
+                            + leftPadding + "-" + rightPadding + "-2*" + padding));
+            panel1.setName(category.getPath());
+            return panel1;
+        });
 
         initCategory(category, panel);
 

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

@@ -199,25 +199,21 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
     @Handler
     public void doDeleteWindow(final SwingWindowDeletedEvent event) {
         final TextFrame window = event.getChildWindow();
-        UIUtilities.invokeAndWait(new Runnable() {
-
-            @Override
-            public void run() {
-                if (nodes.get(window) == null) {
-                    return;
-                }
-                final DefaultMutableTreeNode node = nodes.get(window);
-                if (node.getLevel() == 0) {
-                    eventBus.publishAsync(
-                            new UserErrorEvent(ErrorLevel.MEDIUM, new IllegalArgumentException(),
-                                    "delServer triggered for root node" + node, ""));
-                } else {
-                    model.removeNodeFromParent(nodes.get(window));
-                }
-                synchronized (nodes) {
-                    eventBus.unsubscribe(nodes.get(window).getLabel());
-                    nodes.remove(window);
-                }
+        UIUtilities.invokeAndWait(() -> {
+            if (nodes.get(window) == null) {
+                return;
+            }
+            final DefaultMutableTreeNode node = nodes.get(window);
+            if (node.getLevel() == 0) {
+                eventBus.publishAsync(
+                        new UserErrorEvent(ErrorLevel.MEDIUM, new IllegalArgumentException(),
+                                "delServer triggered for root node" + node, ""));
+            } else {
+                model.removeNodeFromParent(nodes.get(window));
+            }
+            synchronized (nodes) {
+                eventBus.unsubscribe(nodes.get(window).getLabel());
+                nodes.remove(window);
             }
         });
     }
@@ -229,35 +225,31 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
      * @param window Window to add
      */
     public void addWindow(final MutableTreeNode parent, final TextFrame window) {
-        UIUtilities.invokeAndWait(new Runnable() {
-
-            @Override
-            public void run() {
-                final NodeLabel label = new NodeLabel(window, iconManager);
-                eventBus.subscribe(label);
-                swingEventBus.subscribe(label);
-                final TreeViewNode node = new TreeViewNode(label, window);
-                synchronized (nodes) {
-                    nodes.put(window, node);
-                }
-                if (parent == null) {
-                    model.insertNodeInto(node, model.getRootNode());
-                } else {
-                    model.insertNodeInto(node, parent);
-                }
-                tree.expandPath(new TreePath(node.getPath()).getParentPath());
-                final Rectangle view = tree.getRowBounds(tree.getRowForPath(new TreePath(node.
-                        getPath())));
-                if (view != null) {
-                    tree.scrollRectToVisible(new Rectangle(0, (int) view.getY(), 0, 0));
-                }
-
-                // TODO: Should this colour be configurable?
-                node.getLabel().notificationSet(new NotificationSetEvent(window.getContainer(),
-                        window.getContainer().getNotification().orElse(Colour.BLACK)));
-                node.getLabel().iconChanged(new FrameIconChangedEvent(window.getContainer(),
-                        window.getContainer().getIcon()));
+        UIUtilities.invokeAndWait(() -> {
+            final NodeLabel label = new NodeLabel(window, iconManager);
+            eventBus.subscribe(label);
+            swingEventBus.subscribe(label);
+            final TreeViewNode node = new TreeViewNode(label, window);
+            synchronized (nodes) {
+                nodes.put(window, node);
+            }
+            if (parent == null) {
+                model.insertNodeInto(node, model.getRootNode());
+            } else {
+                model.insertNodeInto(node, parent);
             }
+            tree.expandPath(new TreePath(node.getPath()).getParentPath());
+            final Rectangle view = tree.getRowBounds(tree.getRowForPath(new TreePath(node.
+                    getPath())));
+            if (view != null) {
+                tree.scrollRectToVisible(new Rectangle(0, (int) view.getY(), 0, 0));
+            }
+
+            // TODO: Should this colour be configurable?
+            node.getLabel().notificationSet(new NotificationSetEvent(window.getContainer(),
+                    window.getContainer().getNotification().orElse(Colour.BLACK)));
+            node.getLabel().iconChanged(new FrameIconChangedEvent(window.getContainer(),
+                    window.getContainer().getIcon()));
         });
     }