Merge pull request #99 from greboid/standarddialogs

Add lambdas to StandardQuestionDialog.

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

@@ -23,16 +23,21 @@
 package com.dmdirc.addons.ui_swing.components.menubar;
 
 import com.dmdirc.Channel;
+import com.dmdirc.ClientModule;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.ServerState;
+import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
-import com.dmdirc.addons.ui_swing.dialogs.ChannelJoinDialogFactory;
+import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
 import com.dmdirc.addons.ui_swing.dialogs.channellist.ChannelListDialog;
 import com.dmdirc.addons.ui_swing.dialogs.channelsetting.ChannelSettingsDialog;
 import com.dmdirc.addons.ui_swing.injection.DialogProvider;
 import com.dmdirc.addons.ui_swing.injection.KeyedDialogProvider;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
+import com.dmdirc.parser.common.ChannelJoinRequest;
+import com.dmdirc.ui.IconManager;
 
+import java.awt.Dialog;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -52,12 +57,14 @@ public class ChannelMenu extends JMenu implements ActionListener,
 
     /** A version number for this class. */
     private static final long serialVersionUID = 1;
+    /** Icon manager. */
+    private final IconManager iconManager;
+    /** Main frame. */
+    private final MainFrame mainFrame;
     /** Dialog provider. */
     private final KeyedDialogProvider<Channel, ChannelSettingsDialog> dialogProvider;
     /** Channel list dialog provider. */
     private final DialogProvider<ChannelListDialog> channelListDialogProvider;
-    /** Channel join dialog factory. */
-    private final ChannelJoinDialogFactory channelJoinDialogFactory;
     /** Active frame manager. */
     private final ActiveFrameManager activeFrameManager;
     /** Menu items to be disabled/enabled. */
@@ -65,24 +72,18 @@ public class ChannelMenu extends JMenu implements ActionListener,
     private JMenuItem join;
     private JMenuItem list;
 
-    /**
-     * Creates a new channel menu.
-     *
-     * @param activeFrameManager        Active frame manager.
-     * @param dialogProvider            Channel settings dialog provider
-     * @param channelJoinDialogFactory  Channel join dialog factory
-     * @param channelListDialogProvider Channel list dialog provider
-     */
     @Inject
     public ChannelMenu(
             final ActiveFrameManager activeFrameManager,
             final KeyedDialogProvider<Channel, ChannelSettingsDialog> dialogProvider,
-            final ChannelJoinDialogFactory channelJoinDialogFactory,
+            final MainFrame mainFrame,
+            @ClientModule.GlobalConfig final IconManager iconManager,
             final DialogProvider<ChannelListDialog> channelListDialogProvider) {
         super("Channel");
+        this.mainFrame = mainFrame;
+        this.iconManager = iconManager;
         this.activeFrameManager = activeFrameManager;
         this.dialogProvider = dialogProvider;
-        this.channelJoinDialogFactory = channelJoinDialogFactory;
         this.channelListDialogProvider = channelListDialogProvider;
         setMnemonic('c');
         addMenuListener(this);
@@ -120,14 +121,18 @@ public class ChannelMenu extends JMenu implements ActionListener,
     public void actionPerformed(final ActionEvent e) {
         switch (e.getActionCommand()) {
             case "JoinChannel":
-                channelJoinDialogFactory.getChannelJoinDialog("Join channel",
-                        "Enter the name of the channel to join.").displayOrRequestFocus();
+                // TODO: This can NPE on both getActiveFrame and getConnection fix me.
+                new StandardInputDialog(mainFrame, Dialog.ModalityType.MODELESS, iconManager,
+                        "Join Channel", "Enter the name of the channel to join.",
+                        (String s) -> activeFrameManager.getActiveFrame().getContainer()
+                                .getConnection().join(new ChannelJoinRequest(s)))
+                        .displayOrRequestFocus();
                 break;
             case "ChannelSettings":
                 final FrameContainer activeWindow = activeFrameManager.getActiveFrame().
                         getContainer();
                 if (activeWindow instanceof Channel) {
-                    dialogProvider.displayOrRequestFocus(((Channel) activeWindow));
+                    dialogProvider.displayOrRequestFocus((Channel) activeWindow);
                 }
                 break;
             case "ListChannels":

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

@@ -1,73 +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.interfaces.ActiveFrameManager;
-import com.dmdirc.parser.common.ChannelJoinRequest;
-import com.dmdirc.ui.IconManager;
-
-import java.awt.Window;
-
-/**
- * A dialog to prompt the user for a channel and then join that channel.
- */
-public class ChannelJoinDialog extends StandardInputDialog {
-
-    /** Serial version UID. */
-    private static final long serialVersionUID = 1;
-    /** Active frame manager. */
-    private final ActiveFrameManager activeFrameManager;
-
-    /**
-     * Creates a new dialog which prompts a user and then joins the channel they specify.
-     *
-     * @param mainWindow         Main window to use as a parent.
-     * @param activeFrameManager The active window manager
-     * @param iconManager        The icon manager to use for validating text fields.
-     * @param title              Window title
-     * @param message            Window message
-     */
-    public ChannelJoinDialog(
-            final Window mainWindow,
-            final ActiveFrameManager activeFrameManager,
-            final IconManager iconManager,
-            final String title,
-            final String message) {
-        super(mainWindow, ModalityType.APPLICATION_MODAL, iconManager, title, message);
-
-        this.activeFrameManager = activeFrameManager;
-    }
-
-    @Override
-    public boolean save() {
-        activeFrameManager.getActiveFrame().getContainer().getConnection()
-                .join(new ChannelJoinRequest(getText()));
-        return true;
-    }
-
-    @Override
-    public void cancelled() {
-        //Ignore
-    }
-
-}

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

@@ -1,59 +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.ClientModule;
-import com.dmdirc.addons.ui_swing.injection.MainWindow;
-import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
-import com.dmdirc.ui.IconManager;
-
-import java.awt.Window;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-/**
- * Factory for {@link ChannelJoinDialog}s.
- */
-@Singleton
-public class ChannelJoinDialogFactory {
-
-    private final Window mainWindow;
-    private final ActiveFrameManager activeFrameManager;
-    private final IconManager iconManager;
-
-    @Inject
-    public ChannelJoinDialogFactory(
-            @MainWindow final Window mainWindow,
-            final ActiveFrameManager activeFrameManager,
-            @ClientModule.GlobalConfig final IconManager iconManager) {
-        this.mainWindow = mainWindow;
-        this.activeFrameManager = activeFrameManager;
-        this.iconManager = iconManager;
-    }
-
-    public ChannelJoinDialog getChannelJoinDialog(final String title, final String message) {
-        return new ChannelJoinDialog(mainWindow, activeFrameManager, iconManager, title, message);
-    }
-
-}

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

@@ -28,10 +28,14 @@ import com.dmdirc.ui.IconManager;
 import com.dmdirc.util.validators.ValidationResponse;
 import com.dmdirc.util.validators.Validator;
 
+import com.google.common.util.concurrent.Runnables;
+
 import java.awt.Window;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Consumer;
+import java.util.function.Function;
 
 import javax.swing.JButton;
 import javax.swing.WindowConstants;
@@ -45,7 +49,7 @@ import net.miginfocom.swing.MigLayout;
 /**
  * Standard input dialog.
  */
-public abstract class StandardInputDialog extends StandardDialog {
+public class StandardInputDialog extends StandardDialog {
 
     /** Serial version UID. */
     private static final long serialVersionUID = 1;
@@ -61,6 +65,10 @@ public abstract class StandardInputDialog extends StandardDialog {
     private final IconManager iconManager;
     /** Are we saving? */
     protected final AtomicBoolean saving = new AtomicBoolean(false);
+    /** Function to call when the dialog is saved. */
+    private final Function<String, Boolean> save;
+    /** Function to call when the dialog is cancelled. */
+    private final Runnable cancel;
 
     /**
      * Instantiates a new standard input dialog.
@@ -73,8 +81,44 @@ 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, o -> new ValidationResponse());
+            final String title, final String message,
+            final Consumer<String> save) {
+        this(owner, modal, iconManager, title, message,
+                s -> { save.accept(s); return true; }, Runnables.doNothing());
+    }
+
+    /**
+     * Instantiates a new standard input dialog.
+     *
+     * @param owner       Dialog owner
+     * @param modal       modality type
+     * @param iconManager The icon manager to use for validating text fields.
+     * @param title       Dialog title
+     * @param message     Dialog message
+     */
+    public StandardInputDialog(
+            final Window owner, final ModalityType modal, final IconManager iconManager,
+            final String title, final String message,
+            final Function<String, Boolean> save) {
+        this(owner, modal, iconManager, title, message, save, Runnables.doNothing());
+    }
+
+    /**
+     * Instantiates a new standard input dialog.
+     *
+     * @param owner       Dialog owner
+     * @param modal       modality type
+     * @param iconManager The icon manager to use for validating text fields.
+     * @param title       Dialog title
+     * @param message     Dialog message
+     */
+    public StandardInputDialog(
+            final Window owner, final ModalityType modal, final IconManager iconManager,
+            final String title, final String message,
+            final Function<String, Boolean> save,
+            final Runnable cancel) {
+        this(owner, modal, iconManager, title, message, o -> new ValidationResponse(), save,
+                cancel);
     }
 
     /**
@@ -90,12 +134,72 @@ public abstract class StandardInputDialog extends StandardDialog {
     public StandardInputDialog(
             final Window owner, final ModalityType modal, final IconManager iconManager,
             final String title, final String message,
-            final Validator<String> validator) {
+            final Validator<String> validator,
+            final Consumer<String> save) {
+        this(owner, modal, iconManager, title, message, validator,
+                (String s) -> { save.accept(s); return true; }, Runnables.doNothing());
+    }
+
+    /**
+     * Instantiates a new standard input dialog.
+     *
+     * @param owner       Dialog owner
+     * @param modal       modality type
+     * @param iconManager The icon manager to use for validating text fields.
+     * @param validator   Textfield validator
+     * @param title       Dialog title
+     * @param message     Dialog message
+     */
+    public StandardInputDialog(
+            final Window owner, final ModalityType modal, final IconManager iconManager,
+            final String title, final String message,
+            final Validator<String> validator,
+            final Function<String, Boolean> save) {
+        this(owner, modal, iconManager, title, message, validator, save, Runnables.doNothing());
+    }
+    /**
+     * Instantiates a new standard input dialog.
+     *
+     * @param owner       Dialog owner
+     * @param modal       modality type
+     * @param iconManager The icon manager to use for validating text fields.
+     * @param validator   Textfield validator
+     * @param title       Dialog title
+     * @param message     Dialog message
+     */
+    public StandardInputDialog(
+            final Window owner, final ModalityType modal, final IconManager iconManager,
+            final String title, final String message,
+            final Validator<String> validator,
+            final Consumer<String> save,
+            final Runnable cancel) {
+        this(owner, modal, iconManager, title, message, validator,
+                (String s) -> { save.accept(s); return true; }, cancel);
+    }
+
+    /**
+     * Instantiates a new standard input dialog.
+     *
+     * @param owner       Dialog owner
+     * @param modal       modality type
+     * @param iconManager The icon manager to use for validating text fields.
+     * @param validator   Textfield validator
+     * @param title       Dialog title
+     * @param message     Dialog message
+     */
+    public StandardInputDialog(
+            final Window owner, final ModalityType modal, final IconManager iconManager,
+            final String title, final String message,
+            final Validator<String> validator,
+            final Function<String, Boolean> save,
+            final Runnable cancel) {
         super(owner, modal);
 
         this.validator = validator;
         this.message = message;
         this.iconManager = iconManager;
+        this.save = save;
+        this.cancel = cancel;
 
         setTitle(title);
         setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
@@ -105,18 +209,6 @@ public abstract class StandardInputDialog extends StandardDialog {
         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.
      */
@@ -132,12 +224,12 @@ public abstract class StandardInputDialog extends StandardDialog {
      */
     private void addListeners() {
         getOkButton().addActionListener(e -> {
-            if (save()) {
+            if (save.apply(getText())) {
                 dispose();
             }
         });
         getCancelButton().addActionListener(e -> {
-            cancelled();
+            cancel.run();
             dispose();
         });
         addWindowListener(new WindowAdapter() {
@@ -149,7 +241,7 @@ public abstract class StandardInputDialog extends StandardDialog {
 
             @Override
             public void windowClosed(final WindowEvent e) {
-                cancelled();
+                cancel.run();
                 //dispose();
             }
         });

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

@@ -316,33 +316,28 @@ public class ActionsManagerDialog extends StandardDialog implements
         final int index = groups.getSelectedIndex();
         groups.getSelectionModel().clearSelection();
         new StandardInputDialog(this, ModalityType.DOCUMENT_MODAL, iconManager, "New action group",
-                "Please enter the name of the new action group", validator) {
-                    /** Java Serialisation version ID. */
-                    private static final long serialVersionUID = 1;
-
-                    @Override
-                    public boolean save() {
-                        if (!saving.getAndSet(true)) {
-                            groups.setSelectedIndex(index);
-                            if (getText() == null || getText().isEmpty()
-                            && !ActionManager.getActionManager().getGroupsMap()
-                            .containsKey(getText())) {
-                                return false;
-                            } else {
-                                final ActionGroup group = ActionManager
-                                .getActionManager().createGroup(getText());
-                                reloadGroups(group);
-                                return true;
-                            }
-                        }
-                        return false;
-                    }
-
-                    @Override
-                    public void cancelled() {
-                        groups.setSelectedIndex(index);
-                    }
-                }.display(this);
+                "Please enter the name of the new action group", validator,
+                (String s) -> doSaveAddGroup(s, index), () -> doCancelledAddGroup(index))
+                .display(this);
+    }
+
+    private boolean doSaveAddGroup(final String text, final int index) {
+        if (!saving.getAndSet(true)) {
+            groups.setSelectedIndex(index);
+            if (text == null || text.isEmpty()
+                    && !ActionManager.getActionManager().getGroupsMap().containsKey(text)) {
+                return false;
+            } else {
+                final ActionGroup group = ActionManager.getActionManager().createGroup(text);
+                reloadGroups(group);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private void doCancelledAddGroup(final int index) {
+        groups.setSelectedIndex(index);
     }
 
     /**
@@ -352,34 +347,25 @@ public class ActionsManagerDialog extends StandardDialog implements
         final String oldName = groups.getSelectedValue().getName();
         final StandardInputDialog inputDialog = new StandardInputDialog(
                 this, ModalityType.DOCUMENT_MODAL, iconManager, "Edit action group",
-                "Please enter the new name of the action group", validator) {
-                    /** Java Serialisation version ID. */
-                    private static final long serialVersionUID = 1;
-
-                    @Override
-                    public boolean save() {
-                        if (!saving.getAndSet(true)) {
-                            if (getText() == null || getText().isEmpty()) {
-                                return false;
-                            } else {
-                                ActionManager.getActionManager().changeGroupName(
-                                        oldName, getText());
-                                reloadGroups();
-                                return true;
-                            }
-                        }
-                        return false;
-                    }
-
-                    @Override
-                    public void cancelled() {
-                        //Ignore
-                    }
-                };
+                "Please enter the new name of the action group", validator,
+                (String s) -> doSaveEditGroup(oldName, s), () -> {});
         inputDialog.setText(oldName);
         inputDialog.display(this);
     }
 
+    private boolean doSaveEditGroup(final String oldText, final String text) {
+        if (!saving.getAndSet(true)) {
+            if (text == null || text.isEmpty()) {
+                return false;
+            } else {
+                ActionManager.getActionManager().changeGroupName(oldText, text);
+                reloadGroups();
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * Prompts then deletes an action group.
      */

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

@@ -251,20 +251,8 @@ public class AliasManagerLinker {
             @Override
             public void actionPerformed(final ActionEvent e) {
                 new StandardInputDialog(dialog, Dialog.ModalityType.DOCUMENT_MODAL, iconManager,
-                        "Add Alias", "Enter the alias name", model.getNewCommandValidator()) {
-
-                            private static final long serialVersionUID = 3;
-
-                    @Override
-                    public boolean save() {
-                        model.addAlias(getText(), 0, getText());
-                        return true;
-                            }
-
-                    @Override
-                    public void cancelled() {
-                            }
-                        }.display();
+                        "Add Alias", "Enter the alias name", model.getNewCommandValidator(),
+                        (String s) -> model.addAlias(s, 0, s)).display();
             }
         });
     }

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

@@ -291,30 +291,14 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
         new StandardInputDialog(parentWindow, ModalityType.DOCUMENT_MODAL,
                 iconManager, "Add new " + modeText,
                 "Please enter the hostmask for the new " + modeText,
-                new NotEmptyValidator()) {
-                    /**
-                     * 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() {
-                        final DefaultListModel<ChannelListModeItem> model
-                        = (DefaultListModel<ChannelListModeItem>) listModesPanels.get(selectedIndex).
-                        getModel();
-                        model.addElement(new ChannelListModeItem(getText(), "",
-                                        System.currentTimeMillis() / 1000));
-                        updateModeCount();
-                        return true;
-                    }
-
-                    @Override
-                    public void cancelled() {
-                        //Ignore
-                    }
-                }.display();
+                new NotEmptyValidator(), (String s) -> doSaveAddListMode(s, selectedIndex)).display();
+    }
+
+    private void doSaveAddListMode(final String text, final int index) {
+        final DefaultListModel<ChannelListModeItem> model =
+                (DefaultListModel<ChannelListModeItem>) listModesPanels.get(index).getModel();
+        model.addElement(new ChannelListModeItem(text, "",System.currentTimeMillis() / 1000));
+        updateModeCount();
     }
 
     /** Removes a list mode. */

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

@@ -264,32 +264,22 @@ public class URLConfigPanel extends JPanel implements
             new StandardInputDialog(parentWindow,
                     ModalityType.MODELESS, iconManager, "New URL handler",
                     "Please enter the name of the new protocol.",
-                    new URLProtocolValidator(globalConfig)) {
-                        /** Serial version UID. */
-                        private static final long serialVersionUID = 1;
-
-                        @Override
-                        public boolean save() {
-                            try {
-                                final URI uri = new URI(getText() + "://example.test.com");
-                                model.addURI(uri);
-                                details.put(uri, new URLProtocolPanel(globalConfig, userConfig, uri,
-                                                true));
-                                return true;
-                            } catch (final URISyntaxException ex) {
-                                return false;
-                            }
-                        }
-
-                        @Override
-                        public void cancelled() {
-                            //Ignore
-                        }
-                    }.display();
+                    new URLProtocolValidator(globalConfig), this::saveAddNewURLHandler).display();
 
         } else if (e.getSource() == remove) {
             model.removeURI(table.getRowSorter().convertRowIndexToModel(table.getSelectedRow()));
         }
     }
 
+    private boolean saveAddNewURLHandler(final String text) {
+        try {
+            final URI uri = new URI(text + "://example.test.com");
+            model.addURI(uri);
+            details.put(uri, new URLProtocolPanel(globalConfig, userConfig, uri, true));
+            return true;
+        } catch (final URISyntaxException ex) {
+            return false;
+        }
+    }
+
 }

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

@@ -133,19 +133,8 @@ public class ProfileManagerDialogLinker {
      */
     public void bindAddNickname(final JButton addNickname) {
         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());
+                "Add nickname", "Enter nickname to add:", new AddNicknameValidator(model),
+                controller::addNickname).display());
         model.addPropertyChangeListener("selectedprofile",
                 evt -> addNickname.setEnabled(model.isManipulateProfileAllowed()));
         model.addPropertyChangeListener("profiles",
@@ -163,19 +152,7 @@ public class ProfileManagerDialogLinker {
             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() {
-                        }
-                    };
+                    new EditNicknameValidator(model), controller::editNickname);
             inputDialog.setText((String) model.getSelectedNickname());
             inputDialog.display();
         });
@@ -314,19 +291,7 @@ public class ProfileManagerDialogLinker {
             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() {
-                        }
-                    };
+                    new ProfileNameValidator(model.getProfiles()), controller::addProfile);
             inputDialog.setDocumentFilter(new ProfileNameDocumentFilter());
             inputDialog.setText((String) model.getSelectedNickname());
             inputDialog.display();

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

@@ -179,27 +179,8 @@ public final class IgnoreListPanel extends JPanel implements ActionListener, Lis
 
             new StandardInputDialog(parentWindow,
                     ModalityType.MODELESS, iconManager, "New ignore list entry",
-                    "Please enter the new ignore list entry", validatorBuilder.build()) {
-                        /** A version number for this class. */
-                        private static final long serialVersionUID = 2;
-
-                        @Override
-                        public boolean save() {
-                            if (viewToggle.isSelected()) {
-                                cachedIgnoreList.add(getText());
-                            } else {
-                                cachedIgnoreList.addSimple(getText());
-                            }
-
-                            updateList();
-                            return true;
-                        }
-
-                        @Override
-                        public void cancelled() {
-                            //Ignore
-                        }
-                    }.display();
+                    "Please enter the new ignore list entry", validatorBuilder.build(),
+                    this::addNewIgnoreEntry).display();
         } else if (e.getSource() == delButton && list.getSelectedIndex() != -1) {
             new StandardQuestionDialog(parentWindow,
                     ModalityType.APPLICATION_MODAL,
@@ -214,6 +195,15 @@ public final class IgnoreListPanel extends JPanel implements ActionListener, Lis
         }
     }
 
+    private void addNewIgnoreEntry(final String text) {
+        if (viewToggle.isSelected()) {
+            cachedIgnoreList.add(text);
+        } else {
+            cachedIgnoreList.addSimple(text);
+        }
+        updateList();
+    }
+
     @Override
     public void valueChanged(final ListSelectionEvent e) {
         if (list.getSelectedIndex() == -1) {