Use lambdas in StandardQuestionDialog.

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

@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2006-2014 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.dcc;
-
-import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
-import com.dmdirc.interfaces.Connection;
-import com.dmdirc.parser.interfaces.Parser;
-
-import java.awt.Window;
-
-/**
- * Confirm DCC Chat dialog.
- */
-public class ChatRequestDialog extends StandardQuestionDialog {
-
-    private static final long serialVersionUID = 1L;
-    private final DCCManager manager;
-    private final Parser parser;
-    private final String nickname;
-    private final String[] ctcpData;
-
-    public ChatRequestDialog(final Window owner, final DCCManager manager,
-            final Connection connection, final String nickname, final String[] ctcpData) {
-        super(owner, ModalityType.APPLICATION_MODAL,
-                "DCC Chat Request", "User " + nickname + " on "
-                + connection.getAddress()
-                + " would like to start a DCC Chat with you.\n\n"
-                + "Do you want to continue?");
-        this.manager = manager;
-        this.parser = connection.getParser();
-        this.nickname = nickname;
-        this.ctcpData = ctcpData;
-    }
-
-    @Override
-    public boolean save() {
-        manager.handleDCCChat(parser, nickname, ctcpData);
-        return true;
-    }
-
-    @Override
-    public void cancelled() {
-    }
-
-}

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

@@ -34,6 +34,7 @@ import com.dmdirc.addons.dcc.kde.KFileChooser;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.components.frames.ComponentFrameFactory;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
+import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
@@ -55,6 +56,7 @@ import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.util.URLBuilder;
 
+import java.awt.Dialog;
 import java.awt.Window;
 import java.io.File;
 import java.io.IOException;
@@ -406,7 +408,10 @@ public class DCCManager {
             handleDCCChat(connection.getParser(), nickname, ctcpData);
         } else {
             eventBus.publish(new DccChatRequestEvent(connection, nickname));
-            new ChatRequestDialog(mainWindow, this, connection, nickname, ctcpData).display();
+            new StandardQuestionDialog(mainWindow, Dialog.ModalityType.APPLICATION_MODAL,
+                    "DCC Chat Request", "User " + nickname + " on " + connection.getAddress()
+                    + " would like to start a DCC Chat with you.\n\nDo you want to continue?",
+                    () -> handleDCCChat(connection.getParser(), nickname, ctcpData)).display();
         }
     }
 
@@ -518,8 +523,13 @@ public class DCCManager {
                 (token.isEmpty() || port.equals("0"))) {
             // Make sure this is not a reverse DCC Send that we no longer care about.
             eventBus.publish(new DccSendRequestEvent(connection, nickname, filename));
-            new SendRequestDialog(mainWindow, this, token, ipLong, portInt, filename, size,
-                    nickname, connection).display();
+            final long passedSize = size;
+            new StandardQuestionDialog(mainWindow, Dialog.ModalityType.APPLICATION_MODAL,
+                    "DCC Send Request", "User " + nickname + " on " + connection.getAddress()
+                            + " would like to send you a file over DCC.\n\nFile: "
+                            + filename + "\n\nDo you want to continue?",
+                    () -> handleDCCSend(token, ipLong, portInt, filename, passedSize, nickname,
+                            connection.getParser())).display();
         }
     }
 

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

@@ -32,7 +32,7 @@ import com.dmdirc.util.URLBuilder;
 
 import java.awt.Dialog.ModalityType;
 import java.awt.Window;
-import java.util.Arrays;
+import java.util.Collections;
 
 /**
  * Creates a placeholder DCC Frame.
@@ -61,7 +61,7 @@ public class PlaceholderContainer extends FrameContainer {
             final URLBuilder urlBuilder,
             final DMDircMBassador eventBus) {
         super(null, "dcc", "DCCs", "DCCs", config, colourManagerFactory, urlBuilder, eventBus,
-                Arrays.asList("com.dmdirc.addons.dcc.ui.PlaceholderPanel"));
+                Collections.singletonList("com.dmdirc.addons.dcc.ui.PlaceholderPanel"));
         this.plugin = plugin;
         this.parentWindow = parentWindow;
     }
@@ -70,10 +70,10 @@ public class PlaceholderContainer extends FrameContainer {
     public void close() {
         int dccs = 0;
         for (FrameContainer window : getChildren()) {
-            if ((window instanceof TransferContainer
-                    && ((TransferContainer) window).getDCC().isActive())
-                    || (window instanceof ChatContainer
-                    && ((ChatContainer) window).getDCC().isActive())) {
+            if (window instanceof TransferContainer
+                    && ((TransferContainer) window).getDCC().isActive()
+                    || window instanceof ChatContainer
+                    && ((ChatContainer) window).getDCC().isActive()) {
                 dccs++;
             }
         }
@@ -82,26 +82,8 @@ public class PlaceholderContainer extends FrameContainer {
             new StandardQuestionDialog(parentWindow, ModalityType.MODELESS,
                     "Close confirmation",
                     "Closing this window will cause all existing DCCs "
-                    + "to terminate, are you sure you want to do this?") {
-                        /**
-                         * A version number for this class. It should be changed whenever the class
-                         * structure is changed (or anything else that would prevent serialized
-                         * objects being unserialized with the new class).
-                         */
-                        private static final long serialVersionUID = 1;
-
-                        @Override
-                        public boolean save() {
-                            PlaceholderContainer.super.close();
-                            plugin.removeContainer();
-                            return true;
-                        }
-
-                        @Override
-                        public void cancelled() {
-                            // Don't close!
-                        }
-                    }.display();
+                    + "to terminate, are you sure you want to do this?",
+                    () -> { close(); plugin.removeContainer();}).display();
         } else {
             super.close();
             plugin.removeContainer();

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

@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2006-2014 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.dcc;
-
-import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
-import com.dmdirc.interfaces.Connection;
-import com.dmdirc.parser.interfaces.Parser;
-
-import java.awt.Window;
-
-/**
- * Confirm DCC Send dialog.
- */
-public class SendRequestDialog extends StandardQuestionDialog {
-
-    private static final long serialVersionUID = 1L;
-    private final DCCManager manager;
-    private final String token;
-    private final long ip;
-    private final int port;
-    private final String filename;
-    private final long size;
-    private final String nickname;
-    private final Parser parser;
-
-    public SendRequestDialog(final Window owner, final DCCManager manager, final String token,
-            final long ip, final int port, final String filename, final long size,
-            final String nickname, final Connection connection) {
-        super(owner, ModalityType.APPLICATION_MODAL, "DCC Send Request",
-                "User " + nickname + " on "
-                + connection.getAddress()
-                + " would like to send you a file over DCC.\n\nFile: "
-                + filename + "\n\nDo you want to continue?");
-        this.manager = manager;
-        this.token = token;
-        this.ip = ip;
-        this.port = port;
-        this.filename = filename;
-        this.size = size;
-        this.nickname = nickname;
-        this.parser = connection.getParser();
-    }
-
-    @Override
-    public boolean save() {
-        manager.handleDCCSend(token, ip, port, filename, size, nickname, parser);
-        return true;
-    }
-
-    @Override
-    public void cancelled() {
-    }
-
-}

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

@@ -81,7 +81,7 @@ public class NickColourInputDialog extends StandardDialog
             final NickColourPanel panel, final int row,
             final String nickname, final String network,
             final String textcolour, final String nickcolour) {
-        super(parentWindow, false);
+        super(parentWindow, ModalityType.MODELESS);
 
         this.panel = panel;
         this.row = row;

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

@@ -27,7 +27,6 @@ import com.dmdirc.addons.ui_swing.components.SplitPane;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.components.menubar.MenuBar;
 import com.dmdirc.addons.ui_swing.components.statusbar.SwingStatusBar;
-import com.dmdirc.addons.ui_swing.dialogs.ConfirmQuitDialog;
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 import com.dmdirc.addons.ui_swing.events.SwingActiveWindowChangeRequestEvent;
 import com.dmdirc.addons.ui_swing.events.SwingEventBus;
@@ -51,6 +50,7 @@ import com.dmdirc.ui.CoreUIUtils;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.util.collections.QueuedLinkedHashSet;
 
+import java.awt.Dialog;
 import java.awt.Dimension;
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowFocusListener;
@@ -432,16 +432,9 @@ public class MainFrame extends JFrame implements WindowListener, ConfigChangeLis
      */
     public void quit(final int exitCode) {
         if (exitCode == 0 && globalConfig.getOptionBool("ui", "confirmQuit")) {
-            final StandardQuestionDialog dialog = new ConfirmQuitDialog(this) {
-                /** Serial version UID. */
-                private static final long serialVersionUID = 9;
-
-                @Override
-                protected void handleQuit() {
-                    doQuit(exitCode);
-                }
-            };
-            dialog.display();
+            new StandardQuestionDialog(this, Dialog.ModalityType.APPLICATION_MODAL,
+                    "Quit confirm", "You are about to quit DMDirc, are you sure?",
+                    () -> { doQuit(0); return true;}).display();
             return;
         }
         doQuit(exitCode);
@@ -493,7 +486,7 @@ public class MainFrame extends JFrame implements WindowListener, ConfigChangeLis
         activeFrame = event.getWindow();
 
         if (activeFrame.isPresent()) {
-            framePanel.add((activeFrame.get()).getDisplayFrame(), "grow");
+            framePanel.add(activeFrame.get().getDisplayFrame(), "grow");
             setTitle(activeFrame.get().getContainer().getTitle());
         } else {
             framePanel.add(new JPanel(), "grow");

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/ConfirmQuitDialog.java

@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2006-2014 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.ui_swing.dialogs;
-
-import java.awt.Window;
-
-/**
- * A simple dialog to confirm and handle the quitting of the client.
- */
-public abstract class ConfirmQuitDialog extends StandardQuestionDialog {
-
-    /** A version number for this class. */
-    private static final long serialVersionUID = 1;
-
-    /**
-     * Creates a new client quit confirmation dialog.
-     *
-     * @param parentWindow Parent window
-     */
-    public ConfirmQuitDialog(final Window parentWindow) {
-        super(parentWindow, ModalityType.APPLICATION_MODAL, "Quit confirm",
-                "You are about to quit DMDirc, are you sure?");
-    }
-
-    @Override
-    public boolean save() {
-        handleQuit();
-        return true;
-    }
-
-    @Override
-    public void cancelled() {
-        // Do nothing
-    }
-
-    /**
-     * Called when the user confirms they wish to quit the client.
-     */
-    protected abstract void handleQuit();
-
-}

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/DMDircJOptionPane.java

@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2006-2014 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.ui_swing.dialogs;
-
-import javax.swing.JDialog;
-import javax.swing.JOptionPane;
-
-/**
- * Extension of JOptionPane to allow Word Wrapping.
- */
-public class DMDircJOptionPane extends JOptionPane {
-
-    /** A version number for this class. */
-    private static final long serialVersionUID = 1;
-    /** Maximum characters per line. */
-    private int maxCharactersPerLineCount = Integer.MAX_VALUE;
-    /** Title of Dialog. */
-    private String title = "";
-
-    /**
-     * Create a DMDircJOptionPane.
-     *
-     * @param title       Title to use
-     * @param message     Message to show
-     * @param messageType Message Type.
-     * @param optionType  Options.
-     */
-    public DMDircJOptionPane(final String title, final String message,
-            final int messageType, final int optionType) {
-        super(message, messageType, optionType);
-        this.title = title;
-    }
-
-    /**
-     * Set the maximum number of characters per line.
-     *
-     * @param maxCharactersPerLineCount Maximum characters per line
-     */
-    public void setMaxCharactersPerLineCount(final int maxCharactersPerLineCount) {
-        this.maxCharactersPerLineCount = maxCharactersPerLineCount;
-    }
-
-    @Override
-    public int getMaxCharactersPerLineCount() {
-        return this.maxCharactersPerLineCount;
-    }
-
-    /** Show this dialog. */
-    public void showDialog() {
-        // Recalculate width, because JOptionPane calculates it before the
-        // constructor gets a chance to finish, and so gets a max chars of 0.
-        final Object oldMessage = this.getMessage();
-        this.setMessage("");
-        this.setMessage(oldMessage);
-
-        final JDialog dialog = createDialog(title);
-        dialog.setVisible(true);
-        dialog.dispose();
-    }
-
-}

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/StandardDialog.java

@@ -29,11 +29,9 @@ import java.awt.Dimension;
 import java.awt.Window;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import java.util.concurrent.Semaphore;
 
 import javax.swing.JButton;
 import javax.swing.JDialog;
-import javax.swing.SwingUtilities;
 
 /**
  * Provides common methods for dialogs.
@@ -43,22 +41,12 @@ public class StandardDialog extends JDialog {
     /** Serial version UID. */
     private static final long serialVersionUID = 1;
     /** Parent window. */
-    private Window owner;
+    private Component owner;
     /** The OK button for this frame. */
     private JButton okButton;
     /** The cancel button for this frame. */
     private JButton cancelButton;
 
-    /**
-     * Creates a new instance of StandardDialog.
-     *
-     * @param owner The window that owns this dialog
-     * @param modal Whether to display modally or not
-     */
-    public StandardDialog(final Window owner, final boolean modal) {
-        this(owner, modal ? ModalityType.APPLICATION_MODAL : ModalityType.MODELESS);
-    }
-
     /**
      * Creates a new instance of StandardDialog.
      *
@@ -94,7 +82,7 @@ public class StandardDialog extends JDialog {
      *
      * @param parent Parent window
      */
-    public void displayOrRequestFocus(final Window parent) {
+    public void displayOrRequestFocus(final Component parent) {
         if (isVisible()) {
             requestFocus();
         } else {
@@ -107,7 +95,7 @@ public class StandardDialog extends JDialog {
      *
      * @param owner Window to center on
      */
-    public void display(final Window owner) {
+    public void display(final Component owner) {
         this.owner = owner;
         display();
     }
@@ -133,40 +121,6 @@ public class StandardDialog extends JDialog {
         setVisible(true);
     }
 
-    /**
-     * Displays the dialog centering on the parent window, blocking until complete.
-     */
-    public void displayBlocking() {
-        displayBlocking(owner);
-    }
-
-    /**
-     * Displays the dialog centering on the specified window, blocking until complete.
-     *
-     * @param owner Window to center on
-     */
-    public void displayBlocking(final Component owner) {
-        if (SwingUtilities.isEventDispatchThread()) {
-            throw new IllegalStateException("Unable to display blocking dialog"
-                    + " in the EDT.");
-        }
-        final Semaphore semaphore = new Semaphore(0);
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                display();
-                addWindowListener(new WindowAdapter() {
-                    @Override
-                    public void windowClosed(final WindowEvent e) {
-                        semaphore.release();
-                    }
-                });
-            }
-        });
-        semaphore.acquireUninterruptibly();
-    }
-
     /**
      * Centres this dialog on its owner, or the screen if no owner is present.
      */

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/StandardInputDialog.java

@@ -29,13 +29,12 @@ import com.dmdirc.util.validators.ValidationResponse;
 import com.dmdirc.util.validators.Validator;
 
 import java.awt.Window;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.swing.JButton;
+import javax.swing.WindowConstants;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import javax.swing.text.AbstractDocument;
@@ -75,13 +74,7 @@ public abstract class StandardInputDialog extends StandardDialog {
     public StandardInputDialog(
             final Window owner, final ModalityType modal, final IconManager iconManager,
             final String title, final String message) {
-        this(owner, modal, iconManager, title, message, new Validator<String>() {
-
-            @Override
-            public ValidationResponse validate(final String object) {
-                return new ValidationResponse();
-            }
-        });
+        this(owner, modal, iconManager, title, message, o -> new ValidationResponse());
     }
 
     /**
@@ -105,7 +98,7 @@ public abstract class StandardInputDialog extends StandardDialog {
         this.iconManager = iconManager;
 
         setTitle(title);
-        setDefaultCloseOperation(StandardInputDialog.DISPOSE_ON_CLOSE);
+        setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
 
         initComponents();
         addListeners();
@@ -138,23 +131,15 @@ public abstract class StandardInputDialog extends StandardDialog {
      * Adds the listeners.
      */
     private void addListeners() {
-        getOkButton().addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(final ActionEvent e) {
-                if (save()) {
-                    dispose();
-                }
-            }
-        });
-        getCancelButton().addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(final ActionEvent e) {
-                cancelled();
+        getOkButton().addActionListener(e -> {
+            if (save()) {
                 dispose();
             }
         });
+        getCancelButton().addActionListener(e -> {
+            cancelled();
+            dispose();
+        });
         addWindowListener(new WindowAdapter() {
 
             @Override

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/StandardMessageDialog.java

@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 2006-2014 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.ui_swing.dialogs;
-
-import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-
-import java.awt.Window;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-
-import javax.swing.JButton;
-
-import net.miginfocom.swing.MigLayout;
-
-/**
- * Abstract standard dialog for showing messages.
- */
-public class StandardMessageDialog extends StandardDialog {
-
-    /** Serial version UID. */
-    private static final long serialVersionUID = 1;
-    /** Message. */
-    private final String message;
-    /** Blurb label. */
-    private TextLabel blurb;
-
-    /**
-     * Instantiates a new standard input dialog.
-     *
-     * @param owner   Dialog owner
-     * @param modal   modality type
-     * @param title   Dialog title
-     * @param message Dialog message
-     */
-    public StandardMessageDialog(
-            final Window owner, final ModalityType modal, final String title,
-            final String message) {
-        super(owner, modal);
-
-        this.message = message;
-
-        setTitle(title);
-        setDefaultCloseOperation(StandardInputDialog.DISPOSE_ON_CLOSE);
-
-        initComponents();
-        addListeners();
-        layoutComponents();
-    }
-
-    /**
-     * Called when the dialog's OK button is clicked.
-     *
-     * @return whether the dialog can close
-     */
-    public boolean save() {
-        return true;
-    }
-
-    /**
-     * Called when the dialog's cancel button is clicked, or otherwise closed.
-     */
-    public void cancelled() {
-        //Do nothing
-    }
-
-    /**
-     * Initialises the components.
-     */
-    private void initComponents() {
-        orderButtons(new JButton(), new JButton());
-        getOkButton().setText("OK");
-        blurb = new TextLabel(message);
-    }
-
-    /**
-     * Adds the listeners.
-     */
-    private void addListeners() {
-        final ActionListener listener = new ActionListener() {
-
-            @Override
-            public void actionPerformed(final ActionEvent e) {
-                if (save()) {
-                    dispose();
-                }
-            }
-        };
-        getCancelButton().addActionListener(listener);
-        getOkButton().addActionListener(listener);
-        addWindowListener(new WindowAdapter() {
-
-            @Override
-            public void windowOpened(final WindowEvent e) {
-                //Ignore
-            }
-
-            @Override
-            public void windowClosed(final WindowEvent e) {
-                cancelled();
-            }
-        });
-    }
-
-    /**
-     * Lays out the components.
-     */
-    private void layoutComponents() {
-        setLayout(new MigLayout("fill, wrap 1, hidemode 3, wmax min(80sp, 500),"
-                + " wmin min(80sp, 500), pack"));
-
-        add(blurb, "growx");
-        add(getOkButton(), "right");
-    }
-
-}

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/StandardQuestionDialog.java

@@ -25,19 +25,19 @@ package com.dmdirc.addons.ui_swing.dialogs;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 
 import java.awt.Window;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
+import java.util.function.BooleanSupplier;
 
 import javax.swing.JButton;
+import javax.swing.WindowConstants;
 
 import net.miginfocom.swing.MigLayout;
 
 /**
  * Standard input dialog.
  */
-public abstract class StandardQuestionDialog extends StandardDialog {
+public class StandardQuestionDialog extends StandardDialog {
 
     /** Serial version UID. */
     private static final long serialVersionUID = 1;
@@ -46,7 +46,11 @@ public abstract class StandardQuestionDialog extends StandardDialog {
     /** Blurb label. */
     private TextLabel blurb;
     /** Question result. */
-    private boolean result = false;
+    private boolean result;
+    /** Function to call when the dialog is saved. */
+    private final BooleanSupplier save;
+    /** Function to call when the dialog is cancelled. */
+    private final Runnable cancel;
 
     /**
      * Instantiates a new standard input dialog.
@@ -58,31 +62,53 @@ public abstract class StandardQuestionDialog extends StandardDialog {
      */
     public StandardQuestionDialog(
             final Window owner, final ModalityType modal, final String title,
-            final String message) {
+            final String message,
+            final BooleanSupplier save) {
+        this(owner, modal, title, message, save, () -> {});
+    }
+
+    /**
+     * Instantiates a new standard input dialog.
+     *
+     * @param owner   Dialog owner
+     * @param modal   modality type
+     * @param title   Dialog title
+     * @param message Dialog message
+     */
+    public StandardQuestionDialog(
+            final Window owner, final ModalityType modal, final String title,
+            final String message,
+            final Runnable save) {
+        this(owner, modal, title, message, () -> {save.run(); return true; }, () -> {});
+    }
+
+    /**
+     * Instantiates a new standard input dialog.
+     *
+     * @param owner   Dialog owner
+     * @param modal   modality type
+     * @param title   Dialog title
+     * @param message Dialog message
+     */
+    public StandardQuestionDialog(
+            final Window owner, final ModalityType modal, final String title,
+            final String message,
+            final BooleanSupplier save,
+            final Runnable cancel) {
         super(owner, modal);
 
         this.message = message;
+        this.save = save;
+        this.cancel = cancel;
 
         setTitle(title);
-        setDefaultCloseOperation(StandardInputDialog.DISPOSE_ON_CLOSE);
+        setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
 
         initComponents();
         addListeners();
         layoutComponents();
     }
 
-    /**
-     * Called when the dialog's OK button is clicked.
-     *
-     * @return whether the dialog can close
-     */
-    public abstract boolean save();
-
-    /**
-     * Called when the dialog's cancel button is clicked, or otherwise closed.
-     */
-    public abstract void cancelled();
-
     /**
      * Initialises the components.
      */
@@ -97,24 +123,16 @@ public abstract class StandardQuestionDialog extends StandardDialog {
      * Adds the listeners.
      */
     private void addListeners() {
-        getOkButton().addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(final ActionEvent e) {
-                if (save()) {
-                    result = true;
-                    dispose();
-                }
-            }
-        });
-        getCancelButton().addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(final ActionEvent e) {
-                cancelled();
+        getOkButton().addActionListener(e -> {
+            if (save.getAsBoolean()) {
+                result = true;
                 dispose();
             }
         });
+        getCancelButton().addActionListener(e -> {
+            cancel.run();
+            dispose();
+        });
         addWindowListener(new WindowAdapter() {
 
             @Override
@@ -125,7 +143,7 @@ public abstract class StandardQuestionDialog extends StandardDialog {
             @Override
             public void windowClosed(final WindowEvent e) {
                 if (!result) {
-                    cancelled();
+                    cancel.run();
                 }
             }
         });

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

@@ -130,15 +130,14 @@ public class ActionsGroupPanel extends JPanel implements ActionListener,
      */
     private void initComponents() {
         scrollPane = new JScrollPane();
-        model = new ActionTableModel(group == null ? new ArrayList<Action>() : group.getActions());
+        model = new ActionTableModel(group == null ? new ArrayList<>() : group.getActions());
         table = new PackingTable(model, scrollPane, false) {
             /** A version number for this class. */
             private static final long serialVersionUID = 1;
             /** Action type renderer. */
-            private final ActionTypeTableCellRenderer typeRenderer
-                    = new ActionTypeTableCellRenderer();
+            private final TableCellRenderer typeRenderer = new ActionTypeTableCellRenderer();
             /** Action response renderer. */
-            private final ArrayCellRenderer arrayRenderer = new ArrayCellRenderer();
+            private final TableCellRenderer arrayRenderer = new ArrayCellRenderer();
 
             @Override
             public TableCellRenderer getCellRenderer(final int row, final int column) {
@@ -235,25 +234,7 @@ public class ActionsGroupPanel extends JPanel implements ActionListener,
             new StandardQuestionDialog(parent,
                     ModalityType.APPLICATION_MODAL, "Confirm deletion",
                     "Are you sure you wish to delete the action '" + action.
-                    getName() + "'?") {
-                        /**
-                         * A version number for this class. It should be changed whenever the class
-                         * structure is changed (or anything else that would prevent serialized
-                         * objects being unserialized with the new class).
-                         */
-                        private static final long serialVersionUID = 1;
-
-                        @Override
-                        public boolean save() {
-                            group.deleteAction(action);
-                            return true;
-                        }
-
-                        @Override
-                        public void cancelled() {
-                            //Ignore
-                        }
-                    }.display();
+                    getName() + "'?", () -> group.deleteAction(action)).display();
         }
     }
 

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

@@ -385,36 +385,22 @@ public class ActionsManagerDialog extends StandardDialog implements
      */
     private void delGroup() {
         final String group = groups.getSelectedValue().getName();
-        new StandardQuestionDialog(this,
-                ModalityType.APPLICATION_MODAL,
-                "Confirm deletion",
-                "Are you sure you wish to delete the '" + group
-                + "' group and all actions within it?") {
-                    /** Java Serialisation version ID. */
-                    private static final long serialVersionUID = 1;
-
-                    @Override
-                    public boolean save() {
-                        int location = ((DefaultListModel) groups.getModel()).indexOf(
-                                ActionManager.getActionManager().getOrCreateGroup(group));
-                        ActionManager.getActionManager().deleteGroup(group);
-                        reloadGroups();
-                        if (groups.getModel().getSize() == 0) {
-                            location = -1;
-                        } else if (location >= groups.getModel().getSize()) {
-                            location = groups.getModel().getSize();
-                        } else if (location <= 0) {
-                            location = 0;
-                        }
-                        groups.setSelectedIndex(location);
-                        return true;
-                    }
-
-                    @Override
-                    public void cancelled() {
-                        //Ignore
-                    }
-                }.display();
+        new StandardQuestionDialog(this, ModalityType.APPLICATION_MODAL, "Confirm deletion",
+                "Are you sure you wish to delete the '" + group +
+                        "' group and all actions within it?", () -> {
+            int location = ((DefaultListModel) groups.getModel())
+                    .indexOf(ActionManager.getActionManager().getOrCreateGroup(group));
+            ActionManager.getActionManager().deleteGroup(group);
+            reloadGroups();
+            if (groups.getModel().getSize() == 0) {
+                location = -1;
+            } else if (location >= groups.getModel().getSize()) {
+                location = groups.getModel().getSize();
+            } else if (location <= 0) {
+                location = 0;
+            }
+            groups.setSelectedIndex(location);
+        }).display();
     }
 
     @Override

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/profiles/ProfileManagerDialogLinker.java

@@ -30,12 +30,7 @@ import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 import com.dmdirc.ui.IconManager;
 
 import java.awt.Dialog.ModalityType;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 import java.beans.PropertyVetoException;
-import java.beans.VetoableChangeListener;
 
 import javax.swing.DefaultListModel;
 import javax.swing.JButton;
@@ -44,8 +39,6 @@ import javax.swing.JTextField;
 import javax.swing.ListSelectionModel;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
 
 /**
  * Links the UI code with the model and controller.
@@ -78,42 +71,25 @@ public class ProfileManagerDialogLinker {
      * @param list List to bind
      */
     public void bindProfileList(final JList<Profile> list) {
-        list.setModel(new DefaultListModel<Profile>());
+        list.setModel(new DefaultListModel<>());
         final VetoableListSelectionModel listModel = new VetoableListSelectionModel();
         list.setSelectionModel(listModel);
-        listModel.addVetoableSelectionListener(new VetoableChangeListener() {
-
-            @Override
-            public void vetoableChange(final PropertyChangeEvent evt) throws PropertyVetoException {
-                if (!model.isChangeProfileAllowed()) {
-                    throw new PropertyVetoException("", evt);
-                }
+        listModel.addVetoableSelectionListener(evt -> {
+            if (!model.isChangeProfileAllowed()) {
+                throw new PropertyVetoException("", evt);
             }
         });
-        listModel.addListSelectionListener(new ListSelectionListener() {
-            @Override
-            public void valueChanged(final ListSelectionEvent e) {
-                model.setSelectedProfile(list.getSelectedValue());
+        listModel.addListSelectionListener(e -> model.setSelectedProfile(list.getSelectedValue()));
+        model.addPropertyChangeListener("profiles", evt -> {
+            ((DefaultListModel) list.getModel()).clear();
+            for (Profile profile : model.getProfiles()) {
+                ((DefaultListModel<Profile>) list.getModel()).addElement(profile);
             }
-        });
-        model.addPropertyChangeListener("profiles", new PropertyChangeListener() {
-            @Override
-            public void propertyChange(final PropertyChangeEvent evt) {
-                ((DefaultListModel) list.getModel()).clear();
-                for (Profile profile : model.getProfiles()) {
-                    ((DefaultListModel<Profile>) list.getModel()).addElement(profile);
-                }
-                if (list.getSelectedValue() != model.getSelectedProfile()) {
-                    list.setSelectedValue(model.getSelectedProfile(), true);
-                }
-            }
-        });
-        model.addPropertyChangeListener("name", new PropertyChangeListener() {
-            @Override
-            public void propertyChange(final PropertyChangeEvent evt) {
-                list.repaint();
+            if (list.getSelectedValue() != model.getSelectedProfile()) {
+                list.setSelectedValue(model.getSelectedProfile(), true);
             }
         });
+        model.addPropertyChangeListener("name", evt -> list.repaint());
         for (Profile profile : model.getProfiles()) {
             ((DefaultListModel<Profile>) list.getModel()).addElement(profile);
         }
@@ -125,41 +101,27 @@ public class ProfileManagerDialogLinker {
      * @param nicknames list to bind
      */
     public void bindProfileNicknames(final ReorderableJList<String> nicknames) {
-        nicknames.setModel(new DefaultListModel<String>());
+        nicknames.setModel(new DefaultListModel<>());
         nicknames.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-        nicknames.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
-            @Override
-            public void valueChanged(final ListSelectionEvent e) {
-                model.setSelectedNickname(nicknames.getSelectedValue());
-            }
-        });
-        model.addPropertyChangeListener("selectedprofile", new PropertyChangeListener() {
-            @Override
-            public void propertyChange(final PropertyChangeEvent evt) {
-                nicknames.getModel().clear();
-                for (String nickname : model.getNicknames()) {
-                    nicknames.getModel().addElement(nickname);
-                }
-                nicknames.setSelectedValue(model.getSelectedNickname(), true);
-                nicknames.setEnabled(model.isManipulateProfileAllowed());
-            }
+        nicknames.getSelectionModel().addListSelectionListener(
+                e -> model.setSelectedNickname(nicknames.getSelectedValue()));
+        model.addPropertyChangeListener("selectedprofile", evt -> {
+            nicknames.getModel().clear();
+            for (String nickname : model.getNicknames()) {
+                nicknames.getModel().addElement(nickname);
+            }
+            nicknames.setSelectedValue(model.getSelectedNickname(), true);
+            nicknames.setEnabled(model.isManipulateProfileAllowed());
         });
-        model.addPropertyChangeListener("profiles", new PropertyChangeListener() {
-            @Override
-            public void propertyChange(final PropertyChangeEvent evt) {
-                nicknames.setEnabled(model.isManipulateProfileAllowed());
-            }
-        });
-        model.addPropertyChangeListener("nicknames", new PropertyChangeListener() {
-            @Override
-            public void propertyChange(final PropertyChangeEvent evt) {
-                nicknames.getModel().clear();
-                for (String nickname : model.getNicknames()) {
-                    nicknames.getModel().addElement(nickname);
-                }
-                nicknames.setSelectedValue(model.getSelectedNickname(), true);
-                nicknames.setEnabled(model.isManipulateProfileAllowed());
-            }
+        model.addPropertyChangeListener("profiles",
+                evt -> nicknames.setEnabled(model.isManipulateProfileAllowed()));
+        model.addPropertyChangeListener("nicknames", evt -> {
+            nicknames.getModel().clear();
+            for (String nickname : model.getNicknames()) {
+                nicknames.getModel().addElement(nickname);
+            }
+            nicknames.setSelectedValue(model.getSelectedNickname(), true);
+            nicknames.setEnabled(model.isManipulateProfileAllowed());
         });
         nicknames.setEnabled(model.isManipulateProfileAllowed());
     }
@@ -170,37 +132,24 @@ public class ProfileManagerDialogLinker {
      * @param addNickname Button to bind
      */
     public void bindAddNickname(final JButton addNickname) {
-        addNickname.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(final ActionEvent e) {
-                new StandardInputDialog(dialog, ModalityType.DOCUMENT_MODAL, iconManager,
-                        "Add nickname", "Enter nickname to add:", new AddNicknameValidator(model)) {
-                            private static final long serialVersionUID = 1L;
-
-                            @Override
-                            public boolean save() {
-                                controller.addNickname(getText());
-                                return true;
-                            }
-
-                            @Override
-                            public void cancelled() {
-                            }
-                        }.display();
-            }
-        });
-        model.addPropertyChangeListener("selectedprofile", new PropertyChangeListener() {
-            @Override
-            public void propertyChange(final PropertyChangeEvent evt) {
-                addNickname.setEnabled(model.isManipulateProfileAllowed());
-            }
-        });
-        model.addPropertyChangeListener("profiles", new PropertyChangeListener() {
-            @Override
-            public void propertyChange(final PropertyChangeEvent evt) {
-                addNickname.setEnabled(model.isManipulateProfileAllowed());
-            }
-        });
+        addNickname.addActionListener(e -> new StandardInputDialog(dialog, ModalityType.DOCUMENT_MODAL, iconManager,
+                "Add nickname", "Enter nickname to add:", new AddNicknameValidator(model)) {
+                    private static final long serialVersionUID = 1L;
+
+                    @Override
+                    public boolean save() {
+                        controller.addNickname(getText());
+                        return true;
+                    }
+
+                    @Override
+                    public void cancelled() {
+                    }
+                }.display());
+        model.addPropertyChangeListener("selectedprofile",
+                evt -> addNickname.setEnabled(model.isManipulateProfileAllowed()));
+        model.addPropertyChangeListener("profiles",
+                evt -> addNickname.setEnabled(model.isManipulateProfileAllowed()));
         addNickname.setEnabled(model.isManipulateProfileAllowed());
     }
 
@@ -210,41 +159,30 @@ public class ProfileManagerDialogLinker {
      * @param editNickname Button to bind
      */
     public void bindEditNickname(final JButton editNickname) {
-        editNickname.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(final ActionEvent e) {
-                final StandardInputDialog inputDialog = new StandardInputDialog(dialog,
-                        ModalityType.DOCUMENT_MODAL, iconManager,
-                        "Add nickname", "Enter edited nickname:",
-                        new EditNicknameValidator(model)) {
-                            private static final long serialVersionUID = 1L;
-
-                            @Override
-                            public boolean save() {
-                                controller.editNickname(getText());
-                                return true;
-                            }
-
-                            @Override
-                            public void cancelled() {
-                            }
-                        };
-                inputDialog.setText((String) model.getSelectedNickname());
-                inputDialog.display();
-            }
-        });
-        model.addPropertyChangeListener("selectednickname", new PropertyChangeListener() {
-            @Override
-            public void propertyChange(final PropertyChangeEvent evt) {
-                editNickname.setEnabled(model.isManipulateNicknameAllowed());
-            }
-        });
-        model.addPropertyChangeListener("nicknames", new PropertyChangeListener() {
-            @Override
-            public void propertyChange(final PropertyChangeEvent evt) {
-                editNickname.setEnabled(model.isManipulateNicknameAllowed());
-            }
+        editNickname.addActionListener(e -> {
+            final StandardInputDialog inputDialog = new StandardInputDialog(dialog,
+                    ModalityType.DOCUMENT_MODAL, iconManager,
+                    "Add nickname", "Enter edited nickname:",
+                    new EditNicknameValidator(model)) {
+                        private static final long serialVersionUID = 1L;
+
+                        @Override
+                        public boolean save() {
+                            controller.editNickname(getText());
+                            return true;
+                        }
+
+                        @Override
+                        public void cancelled() {
+                        }
+                    };
+            inputDialog.setText((String) model.getSelectedNickname());
+            inputDialog.display();
         });
+        model.addPropertyChangeListener("selectednickname",
+                evt -> editNickname.setEnabled(model.isManipulateNicknameAllowed()));
+        model.addPropertyChangeListener("nicknames",
+                evt -> editNickname.setEnabled(model.isManipulateNicknameAllowed()));
         editNickname.setEnabled(model.isManipulateNicknameAllowed());
     }
 
@@ -254,37 +192,13 @@ public class ProfileManagerDialogLinker {
      * @param deleteNickname Button to bind
      */
     public void bindDeleteNickname(final JButton deleteNickname) {
-        deleteNickname.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(final ActionEvent e) {
-                new StandardQuestionDialog(dialog, ModalityType.DOCUMENT_MODAL,
-                        "Delete nickname?", "Are you sure you want to delete this nickname?") {
-                            private static final long serialVersionUID = 1L;
-
-                            @Override
-                            public boolean save() {
-                                controller.deleteNickname();
-                                return true;
-                            }
-
-                            @Override
-                            public void cancelled() {
-                            }
-                        }.display();
-            }
-        });
-        model.addPropertyChangeListener("selectednickname", new PropertyChangeListener() {
-            @Override
-            public void propertyChange(final PropertyChangeEvent evt) {
-                deleteNickname.setEnabled(model.isManipulateNicknameAllowed());
-            }
-        });
-        model.addPropertyChangeListener("nicknames", new PropertyChangeListener() {
-            @Override
-            public void propertyChange(final PropertyChangeEvent evt) {
-                deleteNickname.setEnabled(model.isManipulateNicknameAllowed());
-            }
-        });
+        deleteNickname.addActionListener(e -> new StandardQuestionDialog(dialog, ModalityType.DOCUMENT_MODAL,
+                "Delete nickname?", "Are you sure you want to delete this nickname?",
+                controller::deleteNickname).display());
+        model.addPropertyChangeListener("selectednickname",
+                evt -> deleteNickname.setEnabled(model.isManipulateNicknameAllowed()));
+        model.addPropertyChangeListener("nicknames",
+                evt -> deleteNickname.setEnabled(model.isManipulateNicknameAllowed()));
         deleteNickname.setEnabled(model.isManipulateNicknameAllowed());
     }
 
@@ -315,19 +229,13 @@ public class ProfileManagerDialogLinker {
                 profileName.setEnabled(model.isManipulateProfileAllowed());
             }
         });
-        model.addPropertyChangeListener("selectedprofile", new PropertyChangeListener() {
-            @Override
-            public void propertyChange(final PropertyChangeEvent evt) {
-                profileName.setText(model.getName());
-                profileName.setEnabled(model.isManipulateProfileAllowed());
-            }
+        model.addPropertyChangeListener("selectedprofile", evt -> {
+            profileName.setText(model.getName());
+            profileName.setEnabled(model.isManipulateProfileAllowed());
         });
-        model.addPropertyChangeListener("profiles", new PropertyChangeListener() {
-            @Override
-            public void propertyChange(final PropertyChangeEvent evt) {
-                profileName.setText(model.getName());
-                profileName.setEnabled(model.isManipulateProfileAllowed());
-            }
+        model.addPropertyChangeListener("profiles", evt -> {
+            profileName.setText(model.getName());
+            profileName.setEnabled(model.isManipulateProfileAllowed());
         });
         profileName.setEnabled(model.isManipulateProfileAllowed());
     }
@@ -357,12 +265,9 @@ public class ProfileManagerDialogLinker {
                 profileRealname.setEnabled(model.isManipulateProfileAllowed());
             }
         });
-        model.addPropertyChangeListener("selectedprofile", new PropertyChangeListener() {
-            @Override
-            public void propertyChange(final PropertyChangeEvent evt) {
-                profileRealname.setText(model.getRealname());
-                profileRealname.setEnabled(model.isManipulateProfileAllowed());
-            }
+        model.addPropertyChangeListener("selectedprofile", evt -> {
+            profileRealname.setText(model.getRealname());
+            profileRealname.setEnabled(model.isManipulateProfileAllowed());
         });
         profileRealname.setEnabled(model.isManipulateProfileAllowed());
     }
@@ -392,18 +297,10 @@ public class ProfileManagerDialogLinker {
                 profileIdent.setEnabled(model.isManipulateProfileAllowed());
             }
         });
-        model.addPropertyChangeListener("selectedprofile", new PropertyChangeListener() {
-            @Override
-            public void propertyChange(final PropertyChangeEvent evt) {
-                profileIdent.setEnabled(model.isManipulateProfileAllowed());
-            }
-        });
-        model.addPropertyChangeListener("profiles", new PropertyChangeListener() {
-            @Override
-            public void propertyChange(final PropertyChangeEvent evt) {
-                profileIdent.setEnabled(model.isManipulateProfileAllowed());
-            }
-        });
+        model.addPropertyChangeListener("selectedprofile",
+                evt -> profileIdent.setEnabled(model.isManipulateProfileAllowed()));
+        model.addPropertyChangeListener("profiles",
+                evt -> profileIdent.setEnabled(model.isManipulateProfileAllowed()));
         profileIdent.setEnabled(model.isManipulateProfileAllowed());
     }
 
@@ -413,29 +310,26 @@ public class ProfileManagerDialogLinker {
      * @param addProfile Button to bind
      */
     public void bindAddProfile(final JButton addProfile) {
-        addProfile.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(final ActionEvent e) {
-                final StandardInputDialog inputDialog = new StandardInputDialog(dialog,
-                        ModalityType.DOCUMENT_MODAL, iconManager,
-                        "Add profile", "New profile name:",
-                        new ProfileNameValidator(model.getProfiles())) {
-                            private static final long serialVersionUID = 1L;
-
-                            @Override
-                            public boolean save() {
-                                controller.addProfile(getText());
-                                return true;
-                            }
-
-                            @Override
-                            public void cancelled() {
-                            }
-                        };
-                inputDialog.setDocumentFilter(new ProfileNameDocumentFilter());
-                inputDialog.setText((String) model.getSelectedNickname());
-                inputDialog.display();
-            }
+        addProfile.addActionListener(e -> {
+            final StandardInputDialog inputDialog = new StandardInputDialog(dialog,
+                    ModalityType.DOCUMENT_MODAL, iconManager,
+                    "Add profile", "New profile name:",
+                    new ProfileNameValidator(model.getProfiles())) {
+                        private static final long serialVersionUID = 1L;
+
+                        @Override
+                        public boolean save() {
+                            controller.addProfile(getText());
+                            return true;
+                        }
+
+                        @Override
+                        public void cancelled() {
+                        }
+                    };
+            inputDialog.setDocumentFilter(new ProfileNameDocumentFilter());
+            inputDialog.setText((String) model.getSelectedNickname());
+            inputDialog.display();
         });
     }
 
@@ -445,31 +339,11 @@ public class ProfileManagerDialogLinker {
      * @param deleteProfile Button to bind
      */
     public void bindDeleteProfile(final JButton deleteProfile) {
-        deleteProfile.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(final ActionEvent e) {
-                new StandardQuestionDialog(dialog, ModalityType.DOCUMENT_MODAL,
-                        "Delete profile?", "Are you sure you want to delete this profile?") {
-                            private static final long serialVersionUID = 1L;
-
-                            @Override
-                            public boolean save() {
-                                controller.deleteProfile();
-                                return true;
-                            }
-
-                            @Override
-                            public void cancelled() {
-                            }
-                        }.display();
-            }
-        });
-        model.addPropertyChangeListener("profiles", new PropertyChangeListener() {
-            @Override
-            public void propertyChange(final PropertyChangeEvent evt) {
-                deleteProfile.setEnabled(model.isManipulateProfileAllowed());
-            }
-        });
+        deleteProfile.addActionListener(e -> new StandardQuestionDialog(dialog, ModalityType.DOCUMENT_MODAL,
+                "Delete profile?", "Are you sure you want to delete this profile?",
+                controller::deleteProfile).display());
+        model.addPropertyChangeListener("profiles",
+                evt -> deleteProfile.setEnabled(model.isManipulateProfileAllowed()));
         deleteProfile.setEnabled(model.isManipulateProfileAllowed());
     }
 
@@ -479,18 +353,8 @@ public class ProfileManagerDialogLinker {
      * @param okButton Button to bind
      */
     public void bindOKButton(final JButton okButton) {
-        okButton.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(final ActionEvent e) {
-                controller.saveAndCloseDialog();
-            }
-        });
-        model.addPropertyChangeListener(new PropertyChangeListener() {
-            @Override
-            public void propertyChange(final PropertyChangeEvent evt) {
-                okButton.setEnabled(model.isOKAllowed());
-            }
-        });
+        okButton.addActionListener(e -> controller.saveAndCloseDialog());
+        model.addPropertyChangeListener(evt -> okButton.setEnabled(model.isOKAllowed()));
         okButton.setEnabled(model.isOKAllowed());
     }
 
@@ -500,12 +364,7 @@ public class ProfileManagerDialogLinker {
      * @param cancelButton Button to bind
      */
     public void bindCancelButton(final JButton cancelButton) {
-        cancelButton.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(final ActionEvent e) {
-                controller.closeDialog();
-            }
-        });
+        cancelButton.addActionListener(e -> controller.closeDialog());
     }
 
 }

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

@@ -92,7 +92,7 @@ public final class IgnoreListPanel extends JPanel implements ActionListener, Lis
         this.connection = connection;
         this.parentWindow = parentWindow;
 
-        this.setOpaque(UIUtilities.getTabbedPaneOpaque());
+        setOpaque(UIUtilities.getTabbedPaneOpaque());
         initComponents();
         addListeners();
         populateList();
@@ -204,23 +204,11 @@ public final class IgnoreListPanel extends JPanel implements ActionListener, Lis
             new StandardQuestionDialog(parentWindow,
                     ModalityType.APPLICATION_MODAL,
                     "Confirm deletion",
-                    "Are you sure you want to delete this item?") {
-                        /** A version number for this class. */
-                        private static final long serialVersionUID = 1;
-
-                        @Override
-                        public boolean save() {
-                            cachedIgnoreList.remove(list.getSelectedIndex());
-
-                            updateList();
-                            return true;
-                        }
-
-                        @Override
-                        public void cancelled() {
-                            //Ignore
-                        }
-                    }.display();
+                    "Are you sure you want to delete this item?",
+                    () -> {
+                        cachedIgnoreList.remove(list.getSelectedIndex());
+                        updateList();
+                    }).display();
         } else if (e.getSource() == viewToggle) {
             listModel.setIsSimple(!viewToggle.isSelected());
         }

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

@@ -43,6 +43,7 @@ import java.awt.event.ActionListener;
 import javax.swing.JButton;
 import javax.swing.JScrollPane;
 import javax.swing.JTabbedPane;
+import javax.swing.ScrollPaneConstants;
 
 import net.miginfocom.swing.MigLayout;
 
@@ -127,12 +128,10 @@ public class ServerSettingsDialog extends StandardDialog implements ActionListen
                 "These settings are specific to this network, any settings specified here will "
                 + "overwrite global settings");
 
-        if (settingsPanel != null) {
-            addSettings();
-        }
+        addSettings();
 
         final JScrollPane userModesSP = new JScrollPane(modesPanel);
-        userModesSP.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+        userModesSP.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
         userModesSP.setOpaque(UIUtilities.getTabbedPaneOpaque());
         userModesSP.getViewport().setOpaque(UIUtilities.getTabbedPaneOpaque());
         userModesSP.setBorder(null);
@@ -174,20 +173,8 @@ public class ServerSettingsDialog extends StandardDialog implements ActionListen
         } else {
             new StandardQuestionDialog(getOwner(), ModalityType.MODELESS,
                     "Server has been disconnected.", "Any changes you have " +
-                    "made will be lost, are you sure you want to close this " + "dialog?") {
-                private static final long serialVersionUID = 1;
-
-                @Override
-                public boolean save() {
-                    ServerSettingsDialog.this.dispose();
-                    return true;
-                }
-
-                @Override
-                public void cancelled() {
-                    //Ignore
-                }
-            }.display();
+                    "made will be lost, are you sure you want to close this " + "dialog?",
+                    () -> { dispose(); }).display();
         }
     }