More J8 improvements.

dcc/src/com/dmdirc/addons/dcc/ui/TransferPanel.java

 
     @Override
     public void socketClosed(final DCCTransfer dcc) {
-        UIUtilities.invokeLater(new Runnable() {
+        UIUtilities.invokeLater(() -> {
+            if (transferContainer.isComplete()) {
+                status.setText("Status: Transfer Complete.");
 
-            @Override
-            public void run() {
-                if (transferContainer.isComplete()) {
-                    status.setText("Status: Transfer Complete.");
-
-                    if (transferContainer.shouldShowOpenButton()) {
-                        openButton.setVisible(true);
-                    }
+                if (transferContainer.shouldShowOpenButton()) {
+                    openButton.setVisible(true);
+                }
 
-                    progress.setValue(100);
-                    button.setText("Close Window");
+                progress.setValue(100);
+                button.setText("Close Window");
+            } else {
+                status.setText("Status: Transfer Failed.");
+                if (dcc.getType() == DCCTransfer.TransferType.SEND) {
+                    button.setText("Resend");
                 } else {
-                    status.setText("Status: Transfer Failed.");
-                    if (dcc.getType() == DCCTransfer.TransferType.SEND) {
-                        button.setText("Resend");
-                    } else {
-                        button.setText("Close Window");
-                    }
+                    button.setText("Close Window");
                 }
             }
         });
 
     @Override
     public void socketOpened(final DCCTransfer dcc) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                status.setText("Status: Socket Opened");
-            }
-        });
+        UIUtilities.invokeLater(() -> status.setText("Status: Socket Opened"));
     }
 
     @Override
     public void dataTransferred(final DCCTransfer dcc, final int bytes) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                if (dcc.getType() == DCCTransfer.TransferType.SEND) {
-                    status.setText("Status: Sending");
-                } else {
-                    status.setText("Status: Receiving");
-                }
-
-                progress.setValue((int) transferContainer.getPercent());
+        UIUtilities.invokeLater(() -> {
+            if (dcc.getType() == DCCTransfer.TransferType.SEND) {
+                status.setText("Status: Sending");
+            } else {
+                status.setText("Status: Receiving");
+            }
 
-                final double bytesPerSecond = transferContainer
-                        .getBytesPerSecond();
+            progress.setValue((int) transferContainer.getPercent());
 
-                if (bytesPerSecond > 1048576) {
-                    speed.setText(String.format("Speed: %.2f MiB/s",
-                            bytesPerSecond / 1048576));
-                } else if (bytesPerSecond > 1024) {
-                    speed.setText(String.format("Speed: %.2f KiB/s",
-                            bytesPerSecond / 1024));
-                } else {
-                    speed.setText(String.format("Speed: %.2f B/s",
-                            bytesPerSecond));
-                }
+            final double bytesPerSecond = transferContainer
+                    .getBytesPerSecond();
 
-                remaining.setText(String.format("Time Remaining: %s",
-                        DateUtils.formatDurationAsTime((int) transferContainer.getRemainingTime())));
-                taken.setText(String.format("Time Taken: %s", transferContainer
-                        .getStartTime() == 0 ? "N/A" : DateUtils.formatDurationAsTime(
-                        (int) transferContainer.getElapsedTime())));
+            if (bytesPerSecond > 1048576) {
+                speed.setText(String.format("Speed: %.2f MiB/s",
+                        bytesPerSecond / 1048576));
+            } else if (bytesPerSecond > 1024) {
+                speed.setText(String.format("Speed: %.2f KiB/s",
+                        bytesPerSecond / 1024));
+            } else {
+                speed.setText(String.format("Speed: %.2f B/s",
+                        bytesPerSecond));
             }
+
+            remaining.setText(String.format("Time Remaining: %s",
+                    DateUtils.formatDurationAsTime((int) transferContainer.getRemainingTime())));
+            taken.setText(String.format("Time Taken: %s", transferContainer
+                    .getStartTime() == 0 ? "N/A" : DateUtils.formatDurationAsTime(
+                    (int) transferContainer.getElapsedTime())));
         });
     }
 

osd/src/com/dmdirc/addons/osd/OsdManager.java

 import java.util.LinkedList;
 import java.util.List;
 import java.util.Queue;
-import java.util.concurrent.Callable;
 
 /**
  * Class to manage OSD Windows.
     private final Window mainFrame;
     /** The controller to read/write settings with. */
     private final IdentityController identityController;
-    /** The Plugin that owns this OSD Manager. */
-    private final OsdPlugin plugin;
     /** The colour manager to use to parse colours. */
     private final ColourManager colourManager;
     /** List of OSD Windows. */
     private final String domain;
 
     public OsdManager(final Window mainFrame, final IdentityController identityController,
-            final OsdPlugin plugin, final ColourManager colourManager,
-            final PluginInfo pluginInfo) {
+            final ColourManager colourManager, final PluginInfo pluginInfo) {
         this.mainFrame = mainFrame;
         this.identityController = identityController;
-        this.plugin = plugin;
         this.colourManager = colourManager;
         this.domain = pluginInfo.getDomain();
     }
      * <p>
      * This method needs to be synchronised to ensure that the window list is not modified in
      * between the invocation of
-     * {@link OsdPolicy#getYPosition(com.dmdirc.addons.osd.OsdManager, int)} and the point at which
+     * {@link OsdPolicy#getYPosition(OsdManager, int)} and the point at which
      * the {@link OsdWindow} is added to the windowList.
      *
-     * @see OsdPolicy#getYPosition(com.dmdirc.addons.osd.OsdManager, int)
+     * @see OsdPolicy#getYPosition(OsdManager, int)
      * @param message Text to display in the OSD window.
      */
     private synchronized void displayWindow(final int timeout, final String message) {
         final int startY = identityController.getGlobalConfiguration()
                 .getOptionInt(domain, "locationY");
 
-        windowList.add(UIUtilities.invokeAndWait(
-                new Callable<OsdWindow>() {
-
-                    @Override
-                    public OsdWindow call() {
-                        return new OsdWindow(
-                                mainFrame,
-                                identityController, OsdManager.this, colourManager,
-                                timeout, message, false,
-                                identityController.getGlobalConfiguration().getOptionInt(
-                                        domain, "locationX"), policy.getYPosition(OsdManager.this,
-                                        startY), domain);
-                    }
-                }));
+        windowList.add(UIUtilities.invokeAndWait(() -> new OsdWindow(
+                mainFrame,
+                identityController, this, colourManager,
+                timeout, message, false,
+                identityController.getGlobalConfiguration().getOptionInt(
+                        domain, "locationX"), policy.getYPosition(this, startY), domain)));
     }
 
     /**
 
         windowList.remove(window);
 
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                window.dispose();
-            }
-        });
+        UIUtilities.invokeLater(window::dispose);
 
         final List<OsdWindow> newList = getWindowList();
         for (OsdWindow otherWindow : newList.subList(closedIndex, newList.size())) {
      * Destroy all OSD Windows.
      */
     public void closeAll() {
-        for (OsdWindow window : getWindowList()) {
-            closeWindow(window);
-        }
+        getWindowList().forEach(this::closeWindow);
     }
 
     /**
         return windowList.size();
     }
 
-    /**
-     * Return the current plugin.
-     *
-     * @return Returns current plugin instance.
-     */
-    public OsdPlugin getPlugin() {
-        return plugin;
-    }
-
 }

osd/src/com/dmdirc/addons/osd/OsdPlugin.java

         this.colourManager = colourManager;
         this.mainFrame = swingController.getMainFrame();
         this.domain = pluginInfo.getDomain();
-        osdManager = new OsdManager(mainFrame, identityController, this, colourManager, pluginInfo);
+        osdManager = new OsdManager(mainFrame, identityController, colourManager, pluginInfo);
         registerCommand(new OsdCommand(commandController, osdManager), OsdCommand.INFO);
     }
 

osd/src/com/dmdirc/addons/osd/OsdWindow.java

         this.desiredX = x;
         this.desiredY = y;
 
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                setLocation(getDesiredX(), getDesiredY());
-            }
-        });
+        UIUtilities.invokeLater(() -> setLocation(getDesiredX(), getDesiredY()));
     }
 
     @Override

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

         eventBus.subscribe(this);
         eventBus.subscribe(mainFrame);
         eventBus.subscribe(linkHandler);
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                errorListDialogProvider.get().load(ErrorManager.getErrorManager());
-            }
-        });
+        SwingUtilities.invokeLater(
+                () -> errorListDialogProvider.get().load(ErrorManager.getErrorManager()));
     }
 
     /**
         }
         windowManager.removeListener(windowFactory.get());
         windowFactory.get().dispose();
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                errorListDialogProvider.get().dispose();
-            }
-        });
+        SwingUtilities.invokeLater(() -> errorListDialogProvider.get().dispose());
         swingEventBus.unsubscribe(mainFrame);
         swingEventBus.unsubscribe(ctrlTabManager);
         mainFrame.dispose();
     public void showURLDialog(final UnknownURLEvent event) {
         if (!event.isHandled()) {
             event.setHandled(true);
-            UIUtilities.invokeLater(new Runnable() {
-
-                @Override
-                public void run() {
-                    urlDialogFactory.getURLDialog(event.getURI()).display();
-                }
-            });
+            UIUtilities.invokeLater(() -> urlDialogFactory.getURLDialog(event.getURI()).display());
         }
     }
 
     @Handler
     public void showFeedbackNag(final FeedbackNagEvent event) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                feedbackNagProvider.get();
-            }
-        });
+        UIUtilities.invokeLater(feedbackNagProvider::get);
     }
 
 }

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

     @Override
     public void addWindow(final FrameContainer parent, final FrameContainer window,
             final boolean focus) {
-        UIUtilities.invokeLater(new Runnable() {
-            @Override
-            public void run() {
-                final TextFrame parentWindow = getSwingWindow(parent);
-                final TextFrame childWindow = doAddWindow(window);
-
-                if (childWindow == null) {
-                    return;
-                }
-                swingEventBus.publish(new SwingWindowAddedEvent(
-                        Optional.ofNullable(parentWindow), childWindow));
-
-                if (focus) {
-                    swingEventBus.publishAsync(new SwingActiveWindowChangeRequestEvent(
-                                    Optional.ofNullable(childWindow)));
-                }
+        UIUtilities.invokeLater(() -> {
+            final TextFrame parentWindow = getSwingWindow(parent);
+            final TextFrame childWindow = doAddWindow(window);
+
+            if (childWindow == null) {
+                return;
+            }
+            swingEventBus.publish(new SwingWindowAddedEvent(
+                    Optional.ofNullable(parentWindow), childWindow));
+
+            if (focus) {
+                swingEventBus.publishAsync(new SwingActiveWindowChangeRequestEvent(
+                                Optional.ofNullable(childWindow)));
             }
         });
     }
         final TextFrame parentWindow = getSwingWindow(parent);
         final TextFrame childWindow = getSwingWindow(window);
         windows.remove(window);
-        UIUtilities.invokeLater(new Runnable() {
-            @Override
-            public void run() {
-                swingEventBus.publish(new SwingWindowDeletedEvent(
-                        Optional.ofNullable(parentWindow), childWindow));
-            }
-        });
+        UIUtilities.invokeLater(() -> swingEventBus.publish(new SwingWindowDeletedEvent(
+                Optional.ofNullable(parentWindow), childWindow)));
     }
 
     /**
 
     /** Disposes of this window factory, removing all listeners. */
     public void dispose() {
-        for (TextFrame frame : windows.values()) {
-            frame.dispose();
-        }
+        windows.values().forEach(TextFrame::dispose);
     }
 
     /**

ui_swing/src/com/dmdirc/addons/ui_swing/adapters/ObservableListTableModelAdapter.java

 
     @Override
     public int getRowCount() {
-        return this.list.size();
+        return list.size();
     }
 
     /**
         @Override
         public void onItemsAdded(final Object source, final int startIndex,
                 final int endIndex) {
-            UIUtilities.invokeLater(new Runnable() {
-
-                @Override
-                public void run() {
-                    fireTableRowsInserted(startIndex, endIndex);
-                }
-            });
+            UIUtilities.invokeLater(() -> fireTableRowsInserted(startIndex, endIndex));
         }
 
         @Override
         public void onItemsRemoved(final Object source, final int startIndex,
                 final int endIndex) {
-            UIUtilities.invokeLater(new Runnable() {
-
-                @Override
-                public void run() {
-                    fireTableRowsDeleted(startIndex, endIndex);
-                }
-            });
+            UIUtilities.invokeLater(() -> fireTableRowsDeleted(startIndex, endIndex));
         }
 
         @Override
         public void onItemsChanged(final Object source, final int startIndex,
                 final int endIndex) {
-            UIUtilities.invokeLater(new Runnable() {
-
-                @Override
-                public void run() {
-                    fireTableRowsUpdated(startIndex, endIndex);
-                }
-            });
+            UIUtilities.invokeLater(() -> fireTableRowsUpdated(startIndex, endIndex));
         }
 
     }

ui_swing/src/com/dmdirc/addons/ui_swing/commands/PopInCommand.java

     @Override
     public void execute(@Nonnull final FrameContainer origin, final CommandArguments args,
             final CommandContext context) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                final TextFrame swingWindow = windowFactory.getSwingWindow(origin);
-                if (swingWindow == null) {
-                    sendLine(origin, args.isSilent(), FORMAT_ERROR, "There is"
-                            + " currently no window to pop in.");
-                } else {
-                    swingWindow.setPopout(false);
-                }
+        UIUtilities.invokeLater(() -> {
+            final TextFrame swingWindow = windowFactory.getSwingWindow(origin);
+            if (swingWindow == null) {
+                sendLine(origin, args.isSilent(), FORMAT_ERROR, "There is"
+                        + " currently no window to pop in.");
+            } else {
+                swingWindow.setPopout(false);
             }
         });
     }

ui_swing/src/com/dmdirc/addons/ui_swing/commands/PopOutCommand.java

     @Override
     public void execute(@Nonnull final FrameContainer origin, final CommandArguments args,
             final CommandContext context) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                final TextFrame swingWindow = windowFactory.getSwingWindow(origin);
-                if (swingWindow == null) {
-                    sendLine(origin, args.isSilent(), FORMAT_ERROR, "There is"
-                            + " currently no window to pop out.");
-                } else {
-                    swingWindow.setPopout(true);
-                }
+        UIUtilities.invokeLater(() -> {
+            final TextFrame swingWindow = windowFactory.getSwingWindow(origin);
+            if (swingWindow == null) {
+                sendLine(origin, args.isSilent(), FORMAT_ERROR, "There is"
+                        + " currently no window to pop out.");
+            } else {
+                swingWindow.setPopout(true);
             }
         });
     }

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

         useAwayIndicator = container.getConfigManager()
                 .getOptionBool("ui", AWAY_INDICATOR);
         if (!useAwayIndicator) {
-            UIUtilities.invokeLater(new Runnable() {
-
-                @Override
-                public void run() {
-                    setVisible(false);
-                }
-            });
+            UIUtilities.invokeLater(() -> setVisible(false));
         }
     }
 
     @Override
     public void onAway(final String reason) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                if (useAwayIndicator) {
-                    setVisible(true);
-                }
+        UIUtilities.invokeLater(() -> {
+            if (useAwayIndicator) {
+                setVisible(true);
             }
         });
     }
 
     @Override
     public void onBack() {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                if (useAwayIndicator) {
-                    setVisible(false);
-                }
+        UIUtilities.invokeLater(() -> {
+            if (useAwayIndicator) {
+                setVisible(false);
             }
         });
     }

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

         useOneTouchExpandable = config.getOptionBool(
                 "ui", "useOneTouchExpandable");
 
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                setOneTouchExpandable(useOneTouchExpandable);
-            }
-        });
+        UIUtilities.invokeLater(() -> setOneTouchExpandable(useOneTouchExpandable));
     }
 
 }

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

 
     @Override
     public void addKeyListener(final KeyListener l) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                listeners.add(KeyListener.class, l);
-            }
-        });
+        UIUtilities.invokeLater(() -> listeners.add(KeyListener.class, l));
     }
 
     @Override
     public void removeKeyListener(final KeyListener l) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                listeners.remove(KeyListener.class, l);
-            }
-        });
+        UIUtilities.invokeLater(() -> listeners.remove(KeyListener.class, l));
     }
 
     @Override

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

                     super.processMouseEvent(e, comp);
                 }
             };
-            UIUtilities.invokeLater(new Runnable() {
-
-                @Override
-                public void run() {
-                    ((JXLayer<JComponent>) component).setUI(layerUI);
-                }
-            });
+            UIUtilities.invokeLater(() -> ((JXLayer<JComponent>) component).setUI(layerUI));
         } else {
             component.addMouseListener(this);
         }

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

 
     @Override
     public final void topicChanged(final Channel channel, final Topic topic) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                if (topicText.isEditable()) {
-                    return;
-                }
-                topicText.setText("");
-                if (topic != null) {
-                channel.getStyliser().addStyledString(
-                        (StyledDocument) topicText.getDocument(),
-                        new String[]{Styliser.CODE_HEXCOLOUR
-                            + UIUtilities.getHex(foregroundColour)
-                                + topic.getTopic(),}, as);
-                }
-                topicText.setCaretPosition(0);
-                validateTopic();
-                setVisible(false);
-                setVisible(true);
+        UIUtilities.invokeLater(() -> {
+            if (topicText.isEditable()) {
+                return;
+            }
+            topicText.setText("");
+            if (topic != null) {
+            channel.getStyliser().addStyledString(
+                    (StyledDocument) topicText.getDocument(),
+                    new String[]{Styliser.CODE_HEXCOLOUR
+                        + UIUtilities.getHex(foregroundColour)
+                            + topic.getTopic(),}, as);
             }
+            topicText.setCaretPosition(0);
+            validateTopic();
+            setVisible(false);
+            setVisible(true);
         });
     }
 
      * @param position New position
      */
     public void setCaretPosition(final int position) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                topicText.setCaretPosition(position);
-            }
-        });
+        UIUtilities.invokeLater(() -> topicText.setCaretPosition(position));
     }
 
     /**
      * @param optionColour Colour for the caret
      */
     public void setCaretColor(final Color optionColour) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                topicText.setCaretColor(optionColour);
-            }
-        });
+        UIUtilities.invokeLater(() -> topicText.setCaretColor(optionColour));
     }
 
     @Override
     public void setForeground(final Color optionColour) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                topicText.setForeground(optionColour);
-            }
-        });
+        UIUtilities.invokeLater(() -> topicText.setForeground(optionColour));
     }
 
     /**
      * @param optionColour Colour for the disabled text
      */
     public void setDisabledTextColour(final Color optionColour) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                topicText.setDisabledTextColor(optionColour);
-            }
-        });
+        UIUtilities.invokeLater(() -> topicText.setDisabledTextColor(optionColour));
     }
 
     @Override
     public void setBackground(final Color optionColour) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                topicText.setBackground(optionColour);
-            }
-        });
+        UIUtilities.invokeLater(() -> topicText.setBackground(optionColour));
     }
 
     @Override
      * Validates the topic text and shows errors as appropriate.
      */
     public void validateTopic() {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                if (topicText.isEditable()) {
-                    final int charsLeft = topicLengthMax - topicText.getText().
-                            length();
-                    if (charsLeft < 0) {
-                        errorIcon.setVisible(true);
-                        errorIcon.setToolTipText("Topic too long: " + topicText.
-                                getText().length() + " of " + topicLengthMax);
-                    } else {
-                        errorIcon.setVisible(false);
-                        errorIcon.setToolTipText(null);
-                    }
+        UIUtilities.invokeLater(() -> {
+            if (topicText.isEditable()) {
+                final int charsLeft = topicLengthMax - topicText.getText().
+                        length();
+                if (charsLeft < 0) {
+                    errorIcon.setVisible(true);
+                    errorIcon.setToolTipText("Topic too long: " + topicText.
+                            getText().length() + " of " + topicLengthMax);
                 } else {
                     errorIcon.setVisible(false);
+                    errorIcon.setToolTipText(null);
                 }
+            } else {
+                errorIcon.setVisible(false);
             }
         });
     }
     public void insertUpdate(final DocumentEvent e) {
         validateTopic();
         if (topicText.isEditable()) {
-            SwingUtilities.invokeLater(new Runnable() {
-                @Override
-                public void run() {
-                    applyAttributes();
-                }
-            });
+            SwingUtilities.invokeLater(this::applyAttributes);
         }
     }
 

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

      * @param tree Tree to scroll
      */
     public static void register(final JTree tree) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                new TreeScroller(tree);
-            }
-        });
+        UIUtilities.invokeLater(() -> new TreeScroller(tree));
     }
 
     /**
     public static void register(final DefaultTreeModel model,
             final TreeSelectionModel selectionModel,
             final boolean rootVisible) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                new TreeScroller(model, selectionModel, rootVisible);
-            }
-        });
+        UIUtilities.invokeLater(() -> new TreeScroller(model, selectionModel, rootVisible));
     }
 
     /**

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

     public void configChanged(final String domain, final String key) {
         useTypingIndicator = container.getConfigManager().getOptionBool("ui", CONFIG_KEY);
         if (!useTypingIndicator) {
-            UIUtilities.invokeLater(new Runnable() {
-
-                @Override
-                public void run() {
-                    setVisible(false);
-                }
-            });
+            UIUtilities.invokeLater(() -> setVisible(false));
         }
     }
 

ui_swing/src/com/dmdirc/addons/ui_swing/components/addonbrowser/DataLoaderWorker.java

 import com.dmdirc.util.io.DownloadListener;
 import com.dmdirc.util.io.Downloader;
 import com.dmdirc.util.io.InvalidConfigFileException;
-import net.miginfocom.swing.MigLayout;
 
-import javax.swing.Box;
-import javax.swing.JPanel;
-import javax.swing.JProgressBar;
-import javax.swing.JScrollPane;
-import javax.swing.text.StyleConstants;
 import java.io.IOException;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 
+import javax.swing.Box;
+import javax.swing.JPanel;
+import javax.swing.JProgressBar;
+import javax.swing.JScrollPane;
+import javax.swing.text.StyleConstants;
+
+import net.miginfocom.swing.MigLayout;
+
 /**
  * Loads the addon data feed into the addon browser.
  */
 
     @Override
     public void downloadProgress(final float percent) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                jpb.setValue((int) percent);
-            }
-        });
+        UIUtilities.invokeLater(() -> jpb.setValue((int) percent));
     }
 
     @Override
     public void setIndeterminate(final boolean indeterminate) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                jpb.setIndeterminate(indeterminate);
-            }
-        });
+        UIUtilities.invokeLater(() -> jpb.setIndeterminate(indeterminate));
     }
 
 }

ui_swing/src/com/dmdirc/addons/ui_swing/components/addonpanel/AddonPanel.java

             protected void done() {
                 super.done();
                 scrollPane.setViewportView(addonList);
-                UIUtilities.invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        addonList.getSelectionModel()
-                                .addListSelectionListener(AddonPanel.this);
-                        addonList.getSelectionModel()
-                                .setSelectionInterval(0, 0);
-                    }
+                UIUtilities.invokeLater(() -> {
+                    addonList.getSelectionModel()
+                            .addListSelectionListener(AddonPanel.this);
+                    addonList.getSelectionModel()
+                            .setSelectionInterval(0, 0);
                 });
             }
         }.execute();

ui_swing/src/com/dmdirc/addons/ui_swing/components/addonpanel/PluginPanel.java

             }
         }
 
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                ((DefaultTableModel) table.getModel()).setNumRows(0);
-                for (final PluginInfo plugin : sortedList) {
-                    ((DefaultTableModel) table.getModel()).addRow(
-                            new AddonCell[]{
-                                new AddonCell(
-                                        new AddonToggle(
-                                                updateManager,
-                                                userConfig,
-                                                pluginManager,
-                                                plugin),
-                                        iconManager),});
-                }
-                table.repaint();
+        UIUtilities.invokeLater(() -> {
+            ((DefaultTableModel) table.getModel()).setNumRows(0);
+            for (final PluginInfo plugin : sortedList) {
+                ((DefaultTableModel) table.getModel()).addRow(
+                        new AddonCell[]{
+                            new AddonCell(
+                                    new AddonToggle(
+                                            updateManager,
+                                            userConfig,
+                                            pluginManager,
+                                            plugin),
+                                    iconManager),});
             }
+            table.repaint();
         });
         return table;
     }

ui_swing/src/com/dmdirc/addons/ui_swing/components/addonpanel/ThemePanel.java

         final List<Theme> list = new ArrayList<>(themeManager.getAllThemes().values());
         Collections.sort(list);
 
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                ((DefaultTableModel) addonList.getModel()).setRowCount(0);
-                for (final Theme theme : list) {
-                    ((DefaultTableModel) addonList.getModel()).addRow(
-                            new AddonCell[]{
-                                new AddonCell(
-                                        new AddonToggle(
-                                                updateManager,
-                                                userConfig,
-                                                themeManager,
-                                                theme),
-                                        iconManager),});
-                }
-
-                addonList.repaint();
+        UIUtilities.invokeLater(() -> {
+            ((DefaultTableModel) addonList.getModel()).setRowCount(0);
+            for (final Theme theme : list) {
+                ((DefaultTableModel) addonList.getModel()).addRow(
+                        new AddonCell[]{
+                            new AddonCell(
+                                    new AddonToggle(
+                                            updateManager,
+                                            userConfig,
+                                            themeManager,
+                                            theme),
+                                    iconManager),});
             }
+
+            addonList.repaint();
         });
         return addonList;
     }

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

         if ("channelSplitPanePosition".equals(key)) {
             final int splitPanePosition = getContainer().getConfigManager()
                     .getOptionInt("ui", "channelSplitPanePosition");
-            UIUtilities.invokeLater(new Runnable() {
-
-                @Override
-                public void run() {
-                    nicklist.setPreferredSize(
-                            new Dimension(splitPanePosition, 0));
-                    splitPane.setDividerLocation(splitPane.getWidth() - splitPane.
-                            getDividerSize() - splitPanePosition);
-                }
+            UIUtilities.invokeLater(() -> {
+                nicklist.setPreferredSize(
+                        new Dimension(splitPanePosition, 0));
+                splitPane.setDividerLocation(splitPane.getWidth() - splitPane.
+                        getDividerSize() - splitPanePosition);
             });
         }
         if ("shownicklist".equals(key)) {

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

      * Called when the frame has been selected in the UI.
      */
     public void activateFrame() {
-        UIUtilities.invokeLater(new Runnable() {
-            @Override
-            public void run() {
-                frameParent.clearNotification();
-            }
-        });
+        UIUtilities.invokeLater(frameParent::clearNotification);
     }
 
     /**

ui_swing/src/com/dmdirc/addons/ui_swing/components/inputfields/SwingInputField.java

 import java.awt.FontMetrics;
 import java.awt.KeyboardFocusManager;
 import java.awt.Window;
-import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
 
     @Override
     public void requestFocus() {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                textField.requestFocus();
-            }
-        });
+        UIUtilities.invokeLater(textField::requestFocus);
     }
 
     @Override
     public boolean requestFocusInWindow() {
-        return UIUtilities.invokeAndWait(new Callable<Boolean>() {
-
-            @Override
-            public Boolean call() {
-                return textField.requestFocusInWindow();
-            }
-        });
+        return UIUtilities.invokeAndWait((Callable<Boolean>) textField::requestFocusInWindow);
     }
 
     @Override
     public void showColourPicker(final boolean irc, final boolean hex) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                if (globalConfig.getOptionBool("general", "showcolourdialog")) {
-                    colourPicker = new ColourPickerDialog(SwingInputField.this,
-                            colourManager, iconManager, irc, hex, parentWindow);
-                    colourPicker.addActionListener(new ActionListener() {
-                        @Override
-                        public void actionPerformed(final ActionEvent actionEvent) {
-                            try {
-                                textField.getDocument().
-                                        insertString(textField.getCaretPosition(),
-                                                actionEvent.getActionCommand(), null);
-                            } catch (final BadLocationException ex) {
-                                //Ignore, wont happen
-                            }
-                            colourPicker.dispose();
-                            colourPicker = null;
-                        }
-                    });
-                    colourPicker.setVisible(true);
-                    colourPicker.setLocation((int) textField.getLocationOnScreen().
-                            getX(),
-                            (int) textField.getLocationOnScreen().getY() - colourPicker.getHeight());
-                }
+        UIUtilities.invokeLater(() -> {
+            if (globalConfig.getOptionBool("general", "showcolourdialog")) {
+                colourPicker = new ColourPickerDialog(SwingInputField.this,
+                        colourManager, iconManager, irc, hex, parentWindow);
+                colourPicker.addActionListener(actionEvent -> {
+                    try {
+                        textField.getDocument().
+                                insertString(textField.getCaretPosition(),
+                                        actionEvent.getActionCommand(), null);
+                    } catch (final BadLocationException ex) {
+                        //Ignore, wont happen
+                    }
+                    colourPicker.dispose();
+                    colourPicker = null;
+                });
+                colourPicker.setVisible(true);
+                colourPicker.setLocation((int) textField.getLocationOnScreen().
+                        getX(),
+                        (int) textField.getLocationOnScreen().getY() - colourPicker.getHeight());
             }
         });
     }
 
     @Override
     public void hideColourPicker() {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                if (colourPicker != null) {
-                    colourPicker.dispose();
-                    colourPicker = null;
-                }
+        UIUtilities.invokeLater(() -> {
+            if (colourPicker != null) {
+                colourPicker.dispose();
+                colourPicker = null;
             }
         });
     }
      * @return JTextField
      */
     public JTextField getTextField() {
-        return UIUtilities.invokeAndWait(new Callable<JTextField>() {
-
-            @Override
-            public JTextField call() {
-                return textField;
-            }
-        });
+        return UIUtilities.invokeAndWait(() -> textField);
     }
 
     @Override
     public void addActionListener(final ActionListener listener) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                textField.addActionListener(listener);
-            }
-        });
+        UIUtilities.invokeLater(() -> textField.addActionListener(listener));
     }
 
     @Override
     public void addKeyListener(final KeyListener listener) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                listeners.add(KeyListener.class, listener);
-            }
-        });
+        UIUtilities.invokeLater(() -> listeners.add(KeyListener.class, listener));
     }
 
     @Override
     public void removeActionListener(final ActionListener listener) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                textField.removeActionListener(listener);
-            }
-        });
+        UIUtilities.invokeLater(() -> textField.removeActionListener(listener));
     }
 
     @Override
     public void removeKeyListener(final KeyListener listener) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                listeners.remove(KeyListener.class, listener);
-            }
-        });
+        UIUtilities.invokeLater(() -> listeners.remove(KeyListener.class, listener));
     }
 
     @Override
     public String getSelectedText() {
-        return UIUtilities.invokeAndWait(new Callable<String>() {
-
-            @Override
-            public String call() {
-                return textField.getSelectedText();
-            }
-        });
+        return UIUtilities.invokeAndWait(textField::getSelectedText);
     }
 
     @Override
     public int getSelectionEnd() {
-        return UIUtilities.invokeAndWait(new Callable<Integer>() {
-
-            @Override
-            public Integer call() {
-                return textField.getSelectionEnd();
-            }
-        });
+        return UIUtilities.invokeAndWait(textField::getSelectionEnd);
     }
 
     @Override
     public int getSelectionStart() {
-        return UIUtilities.invokeAndWait(new Callable<Integer>() {
-
-            @Override
-            public Integer call() {
-                return textField.getSelectionStart();
-            }
-        });
+        return UIUtilities.invokeAndWait(textField::getSelectionStart);
     }
 
     @Override
     public String getText() {
-        return UIUtilities.invokeAndWait(new Callable<String>() {
-
-            @Override
-            public String call() {
-                return textField.getText();
-            }
-        });
+        return UIUtilities.invokeAndWait((Callable<String>) textField::getText);
     }
 
     @Override
     public void setText(final String text) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                textField.setText(text);
-            }
-        });
+        UIUtilities.invokeLater(() -> textField.setText(text));
     }
 
     @Override
     public int getCaretPosition() {
-        return UIUtilities.invokeAndWait(new Callable<Integer>() {
-
-            @Override
-            public Integer call() {
-                return textField.getCaretPosition();
-            }
-        });
+        return UIUtilities.invokeAndWait(textField::getCaretPosition);
     }
 
     @Override
     public void setCaretPosition(final int position) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                textField.setCaretPosition(position);
-            }
-        });
+        UIUtilities.invokeLater(() -> textField.setCaretPosition(position));
     }
 
     /**
      * @param clipboard Text to replace selection with
      */
     public void replaceSelection(final String clipboard) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                textField.replaceSelection(clipboard);
-            }
-        });
+        UIUtilities.invokeLater(() -> textField.replaceSelection(clipboard));
     }
 
     /**
      * @param optionColour Colour for the caret
      */
     public void setCaretColor(final Color optionColour) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                textField.setCaretColor(optionColour);
-            }
-        });
+        UIUtilities.invokeLater(() -> textField.setCaretColor(optionColour));
     }
 
     /**
      */
     @Override
     public void setForeground(final Color optionColour) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                textField.setForeground(optionColour);
-            }
-        });
+        UIUtilities.invokeLater(() -> textField.setForeground(optionColour));
     }
 
     /**
      */
     @Override
     public void setBackground(final Color optionColour) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                textField.setBackground(optionColour);
-            }
-        });
+        UIUtilities.invokeLater(() -> textField.setBackground(optionColour));
     }
 
     @Override
     public boolean hasFocus() {
-        return UIUtilities.invokeAndWait(new Callable<Boolean>() {
-
-            @Override
-            public Boolean call() {
-                return textField.hasFocus();
-            }
-        });
+        return UIUtilities.invokeAndWait(textField::hasFocus);
     }
 
     @Override
     public boolean isFocusOwner() {
-        return UIUtilities.invokeAndWait(new Callable<Boolean>() {
-
-            @Override
-            public Boolean call() {
-                return textField.isFocusOwner();
-            }
-        });
+        return UIUtilities.invokeAndWait(textField::isFocusOwner);
     }
 
     /**
      * @param selectionStart Start index
      */
     public void setSelectionStart(final int selectionStart) {
-        UIUtilities.invokeLater(new Runnable() {
-            @Override
-            public void run() {
-                textField.setSelectionStart(selectionStart);
-            }
-        });
+        UIUtilities.invokeLater(() -> textField.setSelectionStart(selectionStart));
     }
 
     /**
      * @param selectionEnd End index
      */
     public void setSelectionEnd(final int selectionEnd) {
-        UIUtilities.invokeLater(new Runnable() {
-            @Override
-            public void run() {
-                textField.setSelectionEnd(selectionEnd);
-            }
-        });
+        UIUtilities.invokeLater(() -> textField.setSelectionEnd(selectionEnd));
     }
 
     @Override
 
     @Override
     public void illegalCommand(final String reason) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                errorIndicator.setVisible(true);
-                errorIndicator.setToolTipText(reason);
-                wrapIndicator.setVisible(false);
-            }
+        UIUtilities.invokeLater(() -> {
+            errorIndicator.setVisible(true);
+            errorIndicator.setToolTipText(reason);
+            wrapIndicator.setVisible(false);
         });
     }
 
     @Override
     public void legalCommand() {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                errorIndicator.setVisible(false);
-                errorIndicator.setToolTipText(null);
-            }
+        UIUtilities.invokeLater(() -> {
+            errorIndicator.setVisible(false);
+            errorIndicator.setToolTipText(null);
         });
     }
 
     @Override
     public void wrappedText(final int count) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                wrapIndicator.setVisible(count > 1);
-                wrapIndicator.setToolTipText(count + " lines");
-                errorIndicator.setVisible(false);
-            }
+        UIUtilities.invokeLater(() -> {
+            wrapIndicator.setVisible(count > 1);
+            wrapIndicator.setToolTipText(count + " lines");
+            errorIndicator.setVisible(false);
         });
     }
 

ui_swing/src/com/dmdirc/addons/ui_swing/components/inputfields/SwingInputHandler.java

             public void actionPerformed(final ActionEvent e) {
                 final String line = target.getText();
                 target.setText("");
-                UIUtilities.invokeLater(new Runnable() {
-
-                    @Override
-                    public void run() {
-                        final JTextField source;
-                        if (e.getSource() instanceof SwingInputField) {
-                            source = ((SwingInputField) e.getSource())
-                                    .getTextField();
-                        } else if (e.getSource() instanceof JTextField) {
-                            source = (JTextField) e.getSource();
-                        } else {
-                            throw new IllegalArgumentException(
-                                            "Event is not from known source.");
-                        }
-                        if (source.isEditable()) {
-                            new LoggingSwingWorker<Object, Void>(eventBus) {
+                UIUtilities.invokeLater(() -> {
+                    final JTextField source;
+                    if (e.getSource() instanceof SwingInputField) {
+                        source = ((SwingInputField) e.getSource())
+                                .getTextField();
+                    } else if (e.getSource() instanceof JTextField) {
+                        source = (JTextField) e.getSource();
+                    } else {
+                        throw new IllegalArgumentException(
+                                        "Event is not from known source.");
+                    }
+                    if (source.isEditable()) {
+                        new LoggingSwingWorker<Object, Void>(eventBus) {
 
-                                @Override
-                                protected Object doInBackground() {
-                                    enterPressed(line);
-                                    return null;
-                                }
-                            }.execute();
-                        }
+                            @Override
+                            protected Object doInBackground() {
+                                enterPressed(line);
+                                return null;
+                            }
+                        }.execute();
                     }
                 });
             }

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

      * Updates the invite label for the currently active server.
      */
     private void update() {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                if (activeConnection == null || activeConnection.getInvites().isEmpty()) {
-                    setVisible(false);
-                    closeDialog();
-                } else {
-                    refreshDialog();
-                    setVisible(true);
-                }
+        UIUtilities.invokeLater(() -> {
+            if (activeConnection == null || activeConnection.getInvites().isEmpty()) {
+                setVisible(false);
+                closeDialog();
+            } else {
+                refreshDialog();
+                setVisible(true);
             }
         });
     }

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

      * Closes and reopens the dialog to update information and border positions.
      */
     public final void refreshDialog() {
-        UIUtilities.invokeLater(new Runnable() {
-            @Override
-            public void run() {
-                synchronized (StatusbarPanel.this) {
-                    if (dialog != null) {
-                        closeDialog();
-                        openDialog();
-                    }
+        UIUtilities.invokeLater(() -> {
+            synchronized (this) {
+                if (dialog != null) {
+                    closeDialog();
+                    openDialog();
                 }
             }
         });
      * Opens the information dialog.
      */
     protected void openDialog() {
-        synchronized (StatusbarPanel.this) {
+        synchronized (this) {
             if (dialog == null) {
                 setBackground(getPopupBackground());
                 setForeground(getPopupForeground());
      * Closes the information dialog.
      */
     protected void closeDialog() {
-        synchronized (StatusbarPanel.this) {
+        synchronized (this) {
             if (dialog != null) {
                 setBackground(null);
                 setForeground(null);
      * @return is the dialog open
      */
     protected final boolean isDialogOpen() {
-        synchronized (StatusbarPanel.this) {
-            if (dialog != null) {
-                return dialog.isVisible();
-            }
-            return false;
+        synchronized (this) {
+            return dialog != null && dialog.isVisible();
         }
     }
 

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/error/ErrorTableModel.java

     /** Data list. */
     private final List<ProgramError> errors;
     /** Are we ready? */
-    private boolean ready = false;
+    private boolean ready;
 
     /**
      * Creates a new instance of ErrorTableModel.
      */
     public ErrorTableModel() {
-        this.errors = Collections.synchronizedList(new ArrayList<ProgramError>());
+        this.errors = Collections.synchronizedList(new ArrayList<>());
     }
 
     public void load(final ErrorManager errorManager) {
 
     @Override
     public void errorAdded(final ProgramError error) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                addRow(error);
-            }
-        });
+        UIUtilities.invokeLater(() -> addRow(error));
     }
 
     @Override
     public void errorDeleted(final ProgramError error) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                removeRow(error);
-            }
-        });
+        UIUtilities.invokeLater(() -> removeRow(error));
     }
 
     @Override
     public void errorStatusChanged(final ProgramError error) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                synchronized (errors) {
-                    final int errorRow = indexOf(error);
-                    if (errorRow != -1 && errorRow < getRowCount()) {
-                        fireTableRowsUpdated(errorRow, errorRow);
-                    }
+        UIUtilities.invokeLater(() -> {
+            synchronized (errors) {
+                final int errorRow = indexOf(error);
+                if (errorRow != -1 && errorRow < getRowCount()) {
+                    fireTableRowsUpdated(errorRow, errorRow);
                 }
             }
         });

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

 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.ui.IconManager;
 
-import java.awt.Component;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
                 //Hack around mig bug
                 panel.invalidate();
                 panel.validate();
-                for (final Component component : panel.getComponents()) {
-                    if (component instanceof JPanel) {
-                        component.invalidate();
-                        component.validate();
-                    }
-                }
+                Arrays.stream(panel.getComponents()).filter(c -> c instanceof JPanel)
+                        .forEach(c -> {
+                            c.invalidate();
+                            c.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();
-                            }
-                        }
-                    }
+                SwingUtilities.invokeLater(() -> {
+                    panel.invalidate();
+                    panel.validate();
+                    Arrays.stream(panel.getComponents()).filter(c -> c instanceof JPanel)
+                            .forEach(c -> {
+                                c.invalidate();
+                                c.validate();
+                            });
                 });
                 if (category == null) {
                     title.setText("Preferences");
      * @param message Message to display
      */
     public void setError(final String message) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                final JPanel panel = new JPanel(new MigLayout("fillx"));
-                panel.add(new TextLabel("An error has occurred loading the "
-                        + "preferences dialog, an error has been raised: "),
-                        "wrap");
-                panel.add(new TextLabel(message));
-                scrollPane.setViewportView(panel);
-            }
+        UIUtilities.invokeLater(() -> {
+            final JPanel panel = new JPanel(new MigLayout("fillx"));
+            panel.add(new TextLabel("An error has occurred loading the "
+                    + "preferences dialog, an error has been raised: "),
+                    "wrap");
+            panel.add(new TextLabel(message));
+            scrollPane.setViewportView(panel);
         });
     }
 

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

      * Adds the categories from the preferences manager, clearing existing categories first.
      */
     private void addCategories(final List<PreferencesCategory> categories) {
-        UIUtilities.invokeLater(new Runnable() {
-            @Override
-            public void run() {
-                tabList.removeListSelectionListener(SwingPreferencesDialog.this);
-                for (PreferencesCategory category : categories) {
-                    if (!category.isInline()) {
-                        ((DefaultListModel<PreferencesCategory>) tabList.getModel()).addElement(
-                                category);
-                    }
-                    addCategories(category.getSubcats());
+        UIUtilities.invokeLater(() -> {
+            tabList.removeListSelectionListener(this);
+            for (PreferencesCategory category : categories) {
+                if (!category.isInline()) {
+                    ((DefaultListModel<PreferencesCategory>) tabList.getModel()).addElement(
+                            category);
                 }
-                tabList.addListSelectionListener(SwingPreferencesDialog.this);
-                tabList.setSelectedIndex(0);
+                addCategories(category.getSubcats());
             }
+            tabList.addListSelectionListener(this);
+            tabList.setSelectedIndex(0);
         });
         mainPanel.setWaiting(false);
     }

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

     @Override
     public void updateManagerStatusChanged(final UpdateManager manager,
             final UpdateManagerStatus status) {
-        UIUtilities.invokeLater(new Runnable() {
+        UIUtilities.invokeLater(() -> {
+            getOkButton().setEnabled(status != UpdateManagerStatus.WORKING);
 
-            @Override
-            public void run() {
-                getOkButton().setEnabled(status != UpdateManagerStatus.WORKING);
-
-                if (status == UpdateManagerStatus.IDLE_RESTART_NEEDED) {
-                    if (isVisible()) {
-                        restartDialogProvider.displayOrRequestFocus();
-                    }
-                    dispose();
-                } else {
-                    getCancelButton().setVisible(true);
+            if (status == UpdateManagerStatus.IDLE_RESTART_NEEDED) {
+                if (isVisible()) {
+                    restartDialogProvider.displayOrRequestFocus();
                 }
+                dispose();
+            } else {
+                getCancelButton().setVisible(true);
             }
         });
     }

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

      * @param path Path
      */
     public void setTreePath(final TreePath path) {
-        UIUtilities.invokeLater(new Runnable() {
-            @Override
-            public void run() {
-                setSelectionPath(path);
-            }
-        });
+        UIUtilities.invokeLater(() -> setSelectionPath(path));
     }
 
     /**

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

         this.swingEventBus = swingEventBus;
         this.iconManager = iconManager;
 
-        UIUtilities.invokeLater(new Runnable() {
-            @Override
-            public void run() {
-                model = new TreeViewModel(config, new TreeViewNode(null, null));
-                tree = new Tree(TreeFrameManager.this, model, swingEventBus, globalConfig, domain);
-                tree.setCellRenderer(
-                        new TreeViewTreeCellRenderer(config, colourManager, TreeFrameManager.this));
-                tree.setVisible(true);
-
-                config.addChangeListener("treeview", TreeFrameManager.this);
-                config.addChangeListener("ui", "sortrootwindows", TreeFrameManager.this);
-                config.addChangeListener("ui", "sortchildwindows", TreeFrameManager.this);
-                config.addChangeListener("ui", "backgroundcolour", TreeFrameManager.this);
-                config.addChangeListener("ui", "foregroundcolour", TreeFrameManager.this);
-            }
+        UIUtilities.invokeLater(() -> {
+            model = new TreeViewModel(config, new TreeViewNode(null, null));
+            tree = new Tree(this, model, swingEventBus, globalConfig, domain);
+            tree.setCellRenderer(
+                    new TreeViewTreeCellRenderer(config, colourManager, this));
+            tree.setVisible(true);
+
+            config.addChangeListener("treeview", this);
+            config.addChangeListener("ui", "sortrootwindows", this);
+            config.addChangeListener("ui", "sortchildwindows", this);
+            config.addChangeListener("ui", "backgroundcolour", this);
+            config.addChangeListener("ui", "foregroundcolour", this);
         });
     }
 
 
     @Override
     public void setParent(final JComponent parent) {
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                final JScrollPane scrollPane = new JScrollPane(tree);
-                scrollPane.setAutoscrolls(true);
-                scrollPane.setHorizontalScrollBarPolicy(
-                        ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-
-                parent.setVisible(false);
-                parent.setLayout(new MigLayout("ins 0, fill"));
-                parent.add(scrollPane, "grow");
-                parent.setFocusable(false);
-                parent.setVisible(true);
-
-                setColours();
-
-                eventBus.subscribe(TreeFrameManager.this);
-                swingEventBus.subscribe(TreeFrameManager.this);
-                redoTreeView();
-            }
+        SwingUtilities.invokeLater(() -> {
+            final JScrollPane scrollPane = new JScrollPane(tree);
+            scrollPane.setAutoscrolls(true);
+            scrollPane.setHorizontalScrollBarPolicy(
+                    ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
+
+            parent.setVisible(false);
+            parent.setLayout(new MigLayout("ins 0, fill"));
+            parent.add(scrollPane, "grow");
+            parent.setFocusable(false);
+            parent.setVisible(true);
+
+            setColours();
+
+            eventBus.subscribe(this);
+            swingEventBus.subscribe(this);
+            redoTreeView();
         });
     }
 
      * Starts the tree from scratch taking into account new sort orders.
      */
     private void redoTreeView() {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                ((DefaultTreeModel) tree.getModel()).setRoot(null);
-                ((DefaultTreeModel) tree.getModel()).setRoot(new TreeViewNode(null, null));
-                if (scroller != null) {
-                    scroller.unregister();
-                }
-                scroller = new TreeTreeScroller(swingEventBus, tree);
-
-                for (FrameContainer window : windowManager.getRootWindows()) {
-                    addWindow(null, windowFactory.getSwingWindow(window));
-                    final Collection<FrameContainer> childWindows = window.getChildren();
-                    for (FrameContainer childWindow : childWindows) {
-                        addWindow(nodes.get(windowFactory.getSwingWindow(window)),
-                                windowFactory.getSwingWindow(childWindow));
-                    }
+        UIUtilities.invokeLater(() -> {
+            ((DefaultTreeModel) tree.getModel()).setRoot(null);
+            ((DefaultTreeModel) tree.getModel()).setRoot(new TreeViewNode(null, null));
+            if (scroller != null) {
+                scroller.unregister();
+            }
+            scroller = new TreeTreeScroller(swingEventBus, tree);
+
+            for (FrameContainer window : windowManager.getRootWindows()) {
+                addWindow(null, windowFactory.getSwingWindow(window));
+                final Collection<FrameContainer> childWindows = window.getChildren();
+                for (FrameContainer childWindow : childWindows) {
+                    addWindow(nodes.get(windowFactory.getSwingWindow(window)),
+                            windowFactory.getSwingWindow(childWindow));
                 }
+            }
 
-                if (activeFrameManager.getActiveFrame() != null) {
-                    selectionChanged(new SwingWindowSelectedEvent(
-                            Optional.ofNullable(activeFrameManager.getActiveFrame())));
-                }
+            if (activeFrameManager.getActiveFrame() != null) {
+                selectionChanged(new SwingWindowSelectedEvent(
+                        Optional.ofNullable(activeFrameManager.getActiveFrame())));
             }
         });
     }
     @Handler(invocation = EdtHandlerInvocation.class, delivery = Invoke.Asynchronously)
     public void selectionChanged(final SwingWindowSelectedEvent event) {
         if (event.getWindow().isPresent()) {
-            UIUtilities.invokeLater(new Runnable() {
-
-                @Override
-                public void run() {
-                    final TreeNode[] treePath = ((DefaultTreeModel) tree.getModel())
-                            .getPathToRoot(nodes.get(event.getWindow().get()));
-                    if (treePath != null && treePath.length > 0) {
-                        final TreePath path = new TreePath(treePath);
-                        tree.setTreePath(path);
-                        tree.scrollPathToVisible(path);
-                    }
+            UIUtilities.invokeLater(() -> {
+                final TreeNode[] treePath = ((DefaultTreeModel) tree.getModel())
+                        .getPathToRoot(nodes.get(event.getWindow().get()));
+                if (treePath != null && treePath.length > 0) {
+                    final TreePath path = new TreePath(treePath);
+                    tree.setTreePath(path);
+                    tree.scrollPathToVisible(path);
                 }
             });
         }

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

 
     @Override
     public void configChanged(final String domain, final String key) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                scroller.dispose();
-                scroller = new MenuScroller(menu,
-                        config.getOptionInt(configDomain, "windowMenuItems"),
-                        config.getOptionInt(configDomain, "windowMenuScrollInterval"),
-                        fixedCount, 0);
-                scroller.setShowSeperators(false);
-            }
+        UIUtilities.invokeLater(() -> {
+            scroller.dispose();
+            scroller = new MenuScroller(menu,
+                    config.getOptionInt(configDomain, "windowMenuItems"),
+                    config.getOptionInt(configDomain, "windowMenuScrollInterval"),
+                    fixedCount, 0);
+            scroller.setShowSeperators(false);
         });
     }
 

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

 
     /** Clears the TextPane. */
     public void clear() {
-        UIUtilities.invokeLater(new Runnable() {
-            /** {@inheritDoc}. */
-            @Override
-            public void run() {
-                document.clear();
-            }
-        });
+        UIUtilities.invokeLater(document::clear);
     }
 
     /** Clears the selection. */
 
     @Override
     public void trimmed(final int newSize, final int numTrimmed) {
-        UIUtilities.invokeLater(new Runnable() {
-            /** {@inheritDoc}. */
-            @Override
-            public void run() {
-                lastSeenLine -= numTrimmed;
-                final LinePosition selectedRange = getSelectedRange();
-                selectedRange.setStartLine(selectedRange.getStartLine() - numTrimmed);
-                selectedRange.setEndLine(selectedRange.getEndLine() - numTrimmed);
-                if (selectedRange.getStartLine() < 0) {
-                    selectedRange.setStartLine(0);
-                }
-                if (selectedRange.getEndLine() < 0) {
-                    selectedRange.setEndLine(0);
-                }
-                setSelectedText(selectedRange);
-                if (scrollModel.getValue() == scrollModel.getMaximum()) {
-                    setRangeProperties(newSize, newSize);
-                } else {
-                    setRangeProperties(newSize, scrollModel.getValue() - numTrimmed);
-                }
+        UIUtilities.invokeLater(() -> {
+            lastSeenLine -= numTrimmed;
+            final LinePosition selectedRange = getSelectedRange();
+            selectedRange.setStartLine(selectedRange.getStartLine() - numTrimmed);
+            selectedRange.setEndLine(selectedRange.getEndLine() - numTrimmed);
+            if (selectedRange.getStartLine() < 0) {
+                selectedRange.setStartLine(0);
+            }
+            if (selectedRange.getEndLine() < 0) {
+                selectedRange.setEndLine(0);
+            }
+            setSelectedText(selectedRange);
+            if (scrollModel.getValue() == scrollModel.getMaximum()) {
+                setRangeProperties(newSize, newSize);
+            } else {
+                setRangeProperties(newSize, scrollModel.getValue() - numTrimmed);
             }
         });
     }
 
     @Override
     public void cleared() {
-        UIUtilities.invokeLater(new Runnable() {
-            /** {@inheritDoc}. */
-            @Override
-            public void run() {
-                scrollModel.setMaximum(0);
-                scrollModel.setValue(0);
-                canvas.recalc();
-            }
+        UIUtilities.invokeLater(() -> {
+            scrollModel.setMaximum(0);
+            scrollModel.setValue(0);
+            canvas.recalc();
         });
     }
 
     @Override
     public void linesAdded(final int line, final int length, final int size) {
-        UIUtilities.invokeLater(new Runnable() {
-            /** {@inheritDoc}. */
-            @Override
-            public void run() {
-                if (scrollModel.getValue() == scrollModel.getMaximum()) {
-                    setRangeProperties(size, size);
-                } else {
-                    setRangeProperties(size, scrollModel.getValue());
-                    if (showNotification) {
-                        newLineIndicator.setVisible(true);
-                    }
+        UIUtilities.invokeLater(() -> {
+            if (scrollModel.getValue() == scrollModel.getMaximum()) {
+                setRangeProperties(size, size);
+            } else {
+                setRangeProperties(size, scrollModel.getValue());
+                if (showNotification) {
+                    newLineIndicator.setVisible(true);
                 }
             }
         });
 
     @Override
     public void repaintNeeded() {
-        UIUtilities.invokeLater(new Runnable() {
-            /** {@inheritDoc}. */
-            @Override
-            public void run() {
-                canvas.recalc();
-            }
-        });
+        UIUtilities.invokeLater(canvas::recalc);
     }
 
     /**
         showNotification = frame.getContainer().getConfigManager()
                 .getOptionBool(configDomain, "textpanelinenotification");
         if (!showNotification) {
-            UIUtilities.invokeLater(new Runnable() {
-                /** {@inheritDoc}. */
-                @Override
-                public void run() {
-                    newLineIndicator.setVisible(false);
-                }
-            });
+            UIUtilities.invokeLater(() -> newLineIndicator.setVisible(false));
         }
     }
 

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

      */
     private void updateCachedSettings() {
         quickCopy = manager.getOptionBool("ui", "quickCopy");
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                recalc();
-            }
-        });
+        UIUtilities.invokeLater(this::recalc);
     }
 
     private void paintOntoGraphics(final Graphics2D g) {

windowstatus/src/com/dmdirc/addons/windowstatus/WindowStatusPanel.java

      * @param text New text
      */
     public void setText(final String text) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                label.setText(Styliser.stipControlCodes(text));
-            }
-        });
+        UIUtilities.invokeLater(() -> label.setText(Styliser.stipControlCodes(text)));
     }
 
 }