Replace lots of instances of JOptionPane with StandardDialog equivilents, more to follow

Fixes issue 3489

Change-Id: I4fa515a001ccbe1390cb8ca67b717ad16a376218
Reviewed-on: http://gerrit.dmdirc.com/698
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>

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

@@ -39,7 +39,6 @@ import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
 
 import java.awt.event.WindowEvent;
-import java.util.concurrent.atomic.AtomicReference;
 import javax.swing.JPopupMenu;
 import javax.swing.KeyStroke;
 import javax.swing.MenuSelectionManager;

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

@@ -33,6 +33,7 @@ import com.dmdirc.Main;
 import com.dmdirc.ServerManager;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.ui.IconManager;
@@ -44,6 +45,7 @@ import com.dmdirc.ui.interfaces.Window;
 import com.dmdirc.ui.CoreUIUtils;
 import com.dmdirc.ui.interfaces.FrameListener;
 import com.dmdirc.util.ReturnableThread;
+import java.awt.Dialog.ModalityType;
 
 import java.awt.Dimension;
 import java.awt.event.WindowEvent;
@@ -54,7 +56,6 @@ import javax.swing.ImageIcon;
 import javax.swing.JDesktopPane;
 import javax.swing.JFrame;
 import javax.swing.JInternalFrame;
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JSplitPane;
 import javax.swing.MenuSelectionManager;
@@ -125,7 +126,7 @@ public final class MainFrame extends JFrame implements WindowListener,
         showVersion = IdentityManager.getGlobalConfig().getOptionBool("ui",
                 "showversion");
         version = IdentityManager.getGlobalConfig().getOption("version",
-                    "version");
+                "version");
         IdentityManager.getGlobalConfig().addChangeListener("ui", "lookandfeel",
                 this);
         IdentityManager.getGlobalConfig().addChangeListener("ui", "showversion",
@@ -175,8 +176,8 @@ public final class MainFrame extends JFrame implements WindowListener,
             /** {@inheritDoc} */
             @Override
             public void run() {
-                if (position == FramemanagerPosition.LEFT ||
-                        position == FramemanagerPosition.RIGHT) {
+                if (position == FramemanagerPosition.LEFT || position
+                        == FramemanagerPosition.RIGHT) {
                     setObject(frameManagerPanel.getWidth());
                 } else {
                     setObject(frameManagerPanel.getHeight());
@@ -223,7 +224,8 @@ public final class MainFrame extends JFrame implements WindowListener,
     /** {@inheritDoc}. */
     @Override
     public void setTitle(final String title) {
-        if (title != null && getActiveFrame() != null && getActiveFrame().isMaximum()) {
+        if (title != null && getActiveFrame() != null && getActiveFrame().
+                isMaximum()) {
             super.setTitle(getTitlePrefix() + " - " + title);
         } else {
             super.setTitle(getTitlePrefix());
@@ -311,7 +313,7 @@ public final class MainFrame extends JFrame implements WindowListener,
      */
     @Override
     public void windowIconified(final WindowEvent windowEvent) {
-            ActionManager.processEvent(CoreActionType.CLIENT_MINIMISED, null);
+        ActionManager.processEvent(CoreActionType.CLIENT_MINIMISED, null);
     }
 
     /** 
@@ -416,14 +418,14 @@ public final class MainFrame extends JFrame implements WindowListener,
             position = FramemanagerPosition.LEFT;
         }
 
-        if (!mainFrameManager.canPositionVertically() &&
-                (position == FramemanagerPosition.LEFT ||
-                position == FramemanagerPosition.RIGHT)) {
+        if (!mainFrameManager.canPositionVertically() && (position
+                == FramemanagerPosition.LEFT || position
+                == FramemanagerPosition.RIGHT)) {
             position = FramemanagerPosition.BOTTOM;
         }
-        if (!mainFrameManager.canPositionHorizontally() &&
-                (position == FramemanagerPosition.TOP ||
-                position == FramemanagerPosition.BOTTOM)) {
+        if (!mainFrameManager.canPositionHorizontally() && (position
+                == FramemanagerPosition.TOP || position
+                == FramemanagerPosition.BOTTOM)) {
             position = FramemanagerPosition.LEFT;
         }
 
@@ -486,14 +488,42 @@ public final class MainFrame extends JFrame implements WindowListener,
      */
     public void quit(final int exitCode) {
         if (exitCode == 0 && IdentityManager.getGlobalConfig().getOptionBool(
-                "ui", "confirmQuit") && JOptionPane.showConfirmDialog(this,
-                "You are about to quit DMDirc, are you sure?", "Quit confirm",
-                JOptionPane.YES_NO_OPTION,
-                JOptionPane.WARNING_MESSAGE) !=
-                JOptionPane.YES_OPTION) {
+                "ui", "confirmQuit")) {
+            new StandardQuestionDialog(this, ModalityType.APPLICATION_MODAL,
+                    "Quit confirm",
+                    "You are about to quit DMDirc, are you sure?") {
+
+                /**
+                 * 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;
+
+                /** {@inheritDoc} */
+                @Override
+                public boolean save() {
+                    doQuit(exitCode);
+                    return true;
+                }
+
+                /** {@inheritDoc} */
+                @Override
+                public void cancelled() {
+                    return;
+                }
+            }.display();
             return;
         }
+        doQuit(exitCode);
+    }
 
+    /**
+     * Exit code call to quit.
+     *
+     * @param exitCode Exit code
+     */
+    private void doQuit(final int exitCode) {
         this.exitCode = exitCode;
 
         new LoggingSwingWorker() {

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

@@ -131,7 +131,7 @@ public abstract class StandardQuestionDialog extends StandardDialog {
      * Lays out the components.
      */
     private final void layoutComponents() {
-        setLayout(new MigLayout("fill, wrap 1"));
+        setLayout(new MigLayout("fill, wrap 1, hidemode 3"));
 
         add(blurb, "growx");
         add(getLeftButton(), "split 2, right");

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionEditorDialog.java

@@ -24,7 +24,6 @@ package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
 
 import com.dmdirc.actions.Action;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
-import com.dmdirc.ui.CoreUIUtils;
 
 import java.awt.Dimension;
 import java.awt.Window;

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

@@ -28,7 +28,9 @@ import com.dmdirc.actions.ActionManager;
 import com.dmdirc.addons.ui_swing.components.PackingTable;
 import com.dmdirc.addons.ui_swing.components.renderers.ActionTypeTableCellRenderer;
 import com.dmdirc.addons.ui_swing.components.renderers.ArrayCellRenderer;
+import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 import com.dmdirc.addons.ui_swing.dialogs.actioneditor.ActionEditorDialog;
+import java.awt.Dialog.ModalityType;
 
 import java.awt.Window;
 import java.awt.event.ActionEvent;
@@ -38,7 +40,6 @@ import java.awt.event.MouseEvent;
 import java.util.ArrayList;
 
 import javax.swing.JButton;
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.ListSelectionModel;
@@ -129,7 +130,8 @@ public final 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<Action>() : group.
+                getActions());
         table = new PackingTable(model, false, scrollPane, false) {
 
             /**
@@ -234,18 +236,38 @@ public final class ActionsGroupPanel extends JPanel implements ActionListener,
         } else if (e.getSource() == edit) {
             ActionEditorDialog.showActionEditorDialog(parent, group.getName(),
                     model.getAction(
-                    table.getRowSorter().convertRowIndexToModel(table.getSelectedRow())));
+                    table.getRowSorter().convertRowIndexToModel(table.
+                    getSelectedRow())));
         } else if (e.getSource() == delete) {
             final Action action =
                     model.getAction(
-                    table.getRowSorter().convertRowIndexToModel(table.getSelectedRow()));
-            final int response = JOptionPane.showConfirmDialog(this,
-                    "Are you sure you wish to delete the action '" +
-                    action.getName() + "'?",
-                    "Confirm deletion", JOptionPane.YES_NO_OPTION);
-            if (response == JOptionPane.YES_OPTION) {
-                ActionManager.deleteAction(action);
-            }
+                    table.getRowSorter().convertRowIndexToModel(table.
+                    getSelectedRow()));
+            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;
+
+                /** {@inheritDoc} */
+                @Override
+                public boolean save() {
+                    ActionManager.deleteAction(action);
+                    return true;
+                }
+
+                /** {@inheritDoc} */
+                @Override
+                public void cancelled() {
+                    return;
+                }
+            }.display();
         }
     }
 

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

@@ -41,7 +41,7 @@ import com.dmdirc.addons.ui_swing.components.SortedListModel;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
 import com.dmdirc.addons.ui_swing.components.renderers.ActionGroupListCellRenderer;
-import com.dmdirc.addons.ui_swing.dialogs.actioneditor.ActionEditorDialog;
+import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 
 import java.awt.Window;
 import java.awt.event.ActionEvent;
@@ -54,7 +54,6 @@ import javax.swing.BorderFactory;
 import javax.swing.DefaultListModel;
 import javax.swing.JButton;
 import javax.swing.JList;
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.ListSelectionModel;
@@ -323,18 +322,6 @@ public final class ActionsManagerDialog extends StandardDialog implements
         } else if (e.getSource() == getOkButton() || e.getSource()
                 == getCancelButton()) {
             if (!saving.getAndSet(true)) {
-                if (ActionEditorDialog.isOpen()) {
-                    if (JOptionPane.showConfirmDialog(this,
-                            "The action editor is currently open, do you want to cotinue and lose any unsaved changes?",
-                            "Confirm close?", JOptionPane.YES_NO_OPTION,
-                            JOptionPane.QUESTION_MESSAGE)
-                            == JOptionPane.YES_OPTION) {
-                        ActionEditorDialog.getActionEditorDialog(this, "").
-                                dispose();
-                    } else {
-                        return;
-                    }
-                }
                 for (ActionGroupSettingsPanel loopSettings : settings.values()) {
                     loopSettings.save();
                 }
@@ -442,25 +429,44 @@ public final class ActionsManagerDialog extends StandardDialog implements
     private void delGroup() {
         final String group =
                 ((ActionGroup) groups.getSelectedValue()).getName();
-        final int response = JOptionPane.showConfirmDialog(this,
+        new StandardQuestionDialog(this,
+                ModalityType.APPLICATION_MODAL,
+                "Confirm deletion",
                 "Are you sure you wish to delete the '" + group
-                + "' group and all actions within it?",
-                "Confirm deletion", JOptionPane.YES_NO_OPTION);
-        if (response == JOptionPane.YES_OPTION) {
-            int location =
-                    ((DefaultListModel) groups.getModel()).indexOf(
-                    ActionManager.getGroup(group));
-            ActionManager.removeGroup(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;
+                + "' group and all actions within it?") {
+
+            /**
+             * 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;
+
+            /** {@inheritDoc} */
+            @Override
+            public boolean save() {
+                int location =
+                        ((DefaultListModel) groups.getModel()).indexOf(
+                        ActionManager.getGroup(group));
+                ActionManager.removeGroup(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;
             }
-            groups.setSelectedIndex(location);
-        }
+
+            /** {@inheritDoc} */
+            @Override
+            public void cancelled() {
+                return;
+            }
+        }.display();
     }
 
     /** {@inheritDoc} */

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

@@ -32,6 +32,7 @@ import com.dmdirc.actions.CoreActionComparison;
 import com.dmdirc.actions.wrappers.AliasWrapper;
 import com.dmdirc.addons.ui_swing.components.PackingTable;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
+import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 
 import java.awt.Dimension;
 import java.awt.Window;
@@ -42,7 +43,6 @@ import java.util.Arrays;
 import java.util.List;
 
 import javax.swing.JButton;
-import javax.swing.JOptionPane;
 import javax.swing.JScrollPane;
 import javax.swing.JSplitPane;
 import javax.swing.JTable;
@@ -123,7 +123,8 @@ public final class AliasManagerDialog extends StandardDialog implements
      *
      * @return Instance of AliasManagerDialog
      */
-    public static AliasManagerDialog getAliasManagerDialog(final Window parentWindow) {
+    public static AliasManagerDialog getAliasManagerDialog(
+            final Window parentWindow) {
         synchronized (AliasManagerDialog.class) {
             if (me == null) {
                 me = new AliasManagerDialog(parentWindow);
@@ -254,7 +255,8 @@ public final class AliasManagerDialog extends StandardDialog implements
     public void valueChanged(final ListSelectionEvent e) {
         if (!e.getValueIsAdjusting()) {
 
-            if (selectedRow > -1 && selectedRow < tableModel.getRowCount() && aliasDetails.getAlias() == tableModel.getAlias(
+            if (selectedRow > -1 && selectedRow < tableModel.getRowCount() && aliasDetails.
+                    getAlias() == tableModel.getAlias(
                     table.getRowSorter().convertRowIndexToModel(selectedRow))) {
                 updateAlias();
             }
@@ -301,10 +303,34 @@ public final class AliasManagerDialog extends StandardDialog implements
                 updateAlias();
             }
             if (checkForDuplicates()) {
-                JOptionPane.showMessageDialog(this,
-                        "There are duplicate aliases in the table, these need " +
-                        "to be removed before saving", "Duplicates",
-                        JOptionPane.WARNING_MESSAGE);
+                final StandardQuestionDialog dialog = new StandardQuestionDialog(
+                        this, ModalityType.APPLICATION_MODAL,
+                        "Duplicate Aliases",
+                        "There are duplicate aliases in the table, these need "
+                        + "to be removed before saving") {
+
+                    /**
+                     * 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;
+
+                    /** {@inheritDoc} */
+                    @Override
+                    public boolean save() {
+                        return true;
+                    }
+
+                    /** {@inheritDoc} */
+                    @Override
+                    public void cancelled() {
+                        return;
+                    }
+                };
+                dialog.getOkButton().setVisible(false);
+                dialog.getCancelButton().setText("OK");
+                dialog.display();
                 return;
             }
             save();
@@ -355,9 +381,10 @@ public final class AliasManagerDialog extends StandardDialog implements
             if (action == null) {
                 newAliases.add(alias);
             } else {
-                if (!action.getName().equals(alias.getName()) || !action.getConditions().
-                        equals(alias.getArguments()) ||
-                        !Arrays.equals(action.getResponse(), alias.getResponse())) {
+                if (!action.getName().equals(alias.getName()) || !action.
+                        getConditions().
+                        equals(alias.getArguments()) || !Arrays.equals(action.
+                        getResponse(), alias.getResponse())) {
                     modifiedAliases.add(alias);
                 }
                 actions.remove(action);
@@ -416,7 +443,8 @@ public final class AliasManagerDialog extends StandardDialog implements
         Action action = null;
 
         for (Action loopAction : actions) {
-            if (loopAction.getName().equals(alias.getName()) && loopAction.getConditions().
+            if (loopAction.getName().equals(alias.getName()) && loopAction.
+                    getConditions().
                     equals(alias.getArguments())) {
                 action = loopAction;
                 break;
@@ -450,7 +478,7 @@ public final class AliasManagerDialog extends StandardDialog implements
 
         return false;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void dispose() {

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

@@ -26,10 +26,14 @@ import com.dmdirc.addons.ui_swing.components.renderers.ListModeCellRenderer;
 import com.dmdirc.addons.ui_swing.components.renderers.ExtendedListModeCellRenderer;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.Channel;
+import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
 import com.dmdirc.config.IdentityManager;
+import com.dmdirc.config.prefs.validator.NotEmptyValidator;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.parser.common.ChannelListModeItem;
 import com.dmdirc.util.MapList;
+import java.awt.Dialog.ModalityType;
+import java.awt.Window;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -48,7 +52,6 @@ import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
 import javax.swing.JLabel;
 import javax.swing.JList;
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.ListCellRenderer;
@@ -89,17 +92,21 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
     private ListCellRenderer renderer;
     /** Extended info toggle. */
     private final JCheckBox toggle;
+    /** Parent window. */
+    private Window parentWindow;
 
     /**
      * Creates a new instance of ChannelListModePane.
      *
      * @param channel Parent channel
+     * @param parentWindow Parent window
      */
-    public ChannelListModesPane(final Channel channel) {
+    public ChannelListModesPane(final Channel channel, final Window parentWindow) {
         super();
 
         this.setOpaque(UIUtilities.getTabbedPaneOpaque());
         this.channel = channel;
+        this.parentWindow = parentWindow;
 
         if (IdentityManager.getGlobalConfig().getOptionBool("general",
                 "extendedListModes")) {
@@ -110,7 +117,8 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
         listModesPanel = new JScrollPane();
         listModesPanels = new ArrayList<JList>();
         listModesArray =
-                channel.getServer().getParser().getListChannelModes().toCharArray();
+                channel.getServer().getParser().getListChannelModes().
+                toCharArray();
         existingListItems =
                 new MapList<Character, ChannelListModeItem>();
         listModesMenu =
@@ -165,9 +173,10 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
                 (DefaultComboBoxModel) listModesMenu.getModel();
         for (char mode : listModesArray) {
             String modeText = mode + " list";
-            if (channel.getConfigManager().hasOptionString("server", "mode" + mode)) {
+            if (channel.getConfigManager().hasOptionString("server", "mode"
+                    + mode)) {
                 modeText = channel.getConfigManager().getOption("server",
-                        "mode" + mode) + " list [+"+mode+"]";
+                        "mode" + mode) + " list [+" + mode + "]";
             }
             model.addElement(modeText);
 
@@ -227,7 +236,8 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
                 i++) {
             final char mode = listModesArray[i];
             final Enumeration<?> values =
-                    ((DefaultListModel) listModesPanels.get(i).getModel()).elements();
+                    ((DefaultListModel) listModesPanels.get(i).getModel()).
+                    elements();
             final List<ChannelListModeItem> listItems =
                     existingListItems.get(mode);
 
@@ -252,7 +262,8 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
             }
         }
 
-        for (Entry<ChannelListModeItem, Character> entry : currentModes.entrySet()) {
+        for (Entry<ChannelListModeItem, Character> entry :
+                currentModes.entrySet()) {
             channel.getChannelInfo().
                     alterMode(false, entry.getValue(), entry.getKey().getItem());
         }
@@ -267,22 +278,41 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
     private void addListMode() {
         final int selectedIndex = listModesMenu.getSelectedIndex();
         String modeText = String.valueOf(listModesArray[selectedIndex]);
-        String modeMask;
         if (channel.getConfigManager().hasOptionString("server", "mode"
                 + listModesArray[selectedIndex])) {
             modeText = channel.getConfigManager().
                     getOption("server", "mode" + listModesArray[selectedIndex]);
         }
-        modeMask = JOptionPane.showInputDialog(listModesPanel,
-                "Please enter the hostmask for the new " + modeText);
-        if (modeMask != null && (!modeMask.isEmpty() || !modeMask.isEmpty())) {
-            final DefaultListModel model =
-                    (DefaultListModel) listModesPanels.get(selectedIndex).
-                    getModel();
-            model.addElement(new ChannelListModeItem(modeMask, "",
-                    System.currentTimeMillis() / 1000));
-        }
-        updateModeCount();
+        new StandardInputDialog(parentWindow, ModalityType.DOCUMENT_MODAL,
+                "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;
+
+            /** {@inheritDoc} */
+            @Override
+            public boolean save() {
+                final DefaultListModel model =
+                        (DefaultListModel) listModesPanels.get(selectedIndex).
+                        getModel();
+                model.addElement(new ChannelListModeItem(getText(), "",
+                        System.currentTimeMillis() / 1000));
+                updateModeCount();
+                return true;
+            }
+
+            /** {@inheritDoc} */
+            @Override
+            public void cancelled() {
+                return;
+            }
+        }.display();
     }
 
     /** Removes a list mode. */
@@ -348,14 +378,15 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
             modeCount.setText(null);
             return;
         }
-        
+
         final int selected = listModesMenu.getSelectedIndex();
         final int current = listModesPanels.get(selected).getModel().getSize();
         final int maxModes = channel.getServer().getParser().
                 getMaxListModes(listModesArray[selected]);
-        
+
         if (maxModes == -1) {
-            modeCount.setText(current + " mode" + (current == 1 ? "" : "s") + " set");
+            modeCount.setText(current + " mode" + (current == 1 ? "" : "s")
+                    + " set");
         } else {
             modeCount.setText(current + " mode" + (current == 1 ? "" : "s")
                     + " set (maximum of " + maxModes + ")");

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

@@ -170,7 +170,7 @@ public final class ChannelSettingsDialog extends StandardDialog implements
 
     /** Initialises the IRC Settings tab. */
     private void initListModesTab() {
-        channelListModesPane = new ChannelListModesPane(channel);
+        channelListModesPane = new ChannelListModesPane(channel, this);
         tabbedPane.addTab("List Modes", channelListModesPane);
     }
 

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

@@ -31,10 +31,12 @@ import com.dmdirc.config.prefs.validator.ValidationResponse;
 import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
 import com.dmdirc.addons.ui_swing.components.reorderablelist.ReorderableJList;
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
+import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 import com.dmdirc.config.prefs.validator.ValidatorChain;
 
 import java.awt.Color;
 import java.awt.Dialog.ModalityType;
+import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
@@ -93,18 +95,22 @@ public final class ProfileDetailPanel extends JPanel implements ActionListener,
     private Border passBorder;
     /** Validation failed border. */
     private Border failBorder;
+    /** Parent window. */
+    private Window parentWindow;
 
     /**
      * Creates a new profile detail panel.
      * 
      * @param model The list model to use to validate names
      * @param mainFrame Main frame
+     * @param parentWindow Parent window
      */
     @SuppressWarnings("unchecked")
     public ProfileDetailPanel(final ProfileListModel model,
-            final MainFrame mainFrame) {
+            final MainFrame mainFrame, final Window parentWindow) {
         super();
         this.mainFrame = mainFrame;
+        this.parentWindow = parentWindow;
 
         this.model = model;
         this.nicknameModel = new DefaultListModel();
@@ -309,11 +315,31 @@ public final class ProfileDetailPanel extends JPanel implements ActionListener,
             };
             dialog.setText((String) nicknames.getSelectedValue());
             dialog.display();
-        } else if (e.getSource() == delButton && JOptionPane.showConfirmDialog(this,
-                "Are you sure you want to delete this nickname?",
-                "Delete Confirmaton", JOptionPane.YES_NO_OPTION) ==
-                JOptionPane.YES_OPTION) {
-            nicknames.getModel().removeElementAt(nicknames.getSelectedIndex());
+        } else if (e.getSource() == delButton) {
+            new StandardQuestionDialog(parentWindow, ModalityType.DOCUMENT_MODAL,
+                    "Delete Confirmaton",
+                    "Are you sure you want to delete this nickname?") {
+
+                /**
+                 * 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;
+
+                /** {@inheritDoc} */
+                @Override
+                public boolean save() {
+                    nicknames.getModel().removeElementAt(nicknames.getSelectedIndex());
+                    return true;
+                }
+
+                /** {@inheritDoc} */
+                @Override
+                public void cancelled() {
+                    return;
+                }
+            }.display();
         }
     }
 

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

@@ -28,6 +28,7 @@ import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.components.renderers.ProfileListCellRenderer;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.dialogs.NewServerDialog;
+import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
 
@@ -40,7 +41,6 @@ import java.util.List;
 
 import javax.swing.JButton;
 import javax.swing.JList;
-import javax.swing.JOptionPane;
 import javax.swing.JScrollPane;
 import javax.swing.ListSelectionModel;
 import javax.swing.WindowConstants;
@@ -50,7 +50,8 @@ import javax.swing.event.ListSelectionListener;
 import net.miginfocom.swing.MigLayout;
 
 /** Profile editing dialog. */
-public final class ProfileManagerDialog extends StandardDialog implements ActionListener,
+public final class ProfileManagerDialog extends StandardDialog implements
+        ActionListener,
         ListSelectionListener {
 
     /**
@@ -102,7 +103,7 @@ public final class ProfileManagerDialog extends StandardDialog implements Action
             selectedIndex = -1;
         }
     }
-    
+
     /** 
      * Creates the dialog if one doesn't exist, and displays it. 
      * 
@@ -122,7 +123,8 @@ public final class ProfileManagerDialog extends StandardDialog implements Action
      *
      * @return The current ProfileManagerDialog instance
      */
-    public static ProfileManagerDialog getProfileManagerDialog(final MainFrame mainFrame) {
+    public static ProfileManagerDialog getProfileManagerDialog(
+            final MainFrame mainFrame) {
         synchronized (ProfileManagerDialog.class) {
             if (me == null) {
                 me = new ProfileManagerDialog(mainFrame);
@@ -142,13 +144,13 @@ public final class ProfileManagerDialog extends StandardDialog implements Action
 
         model = new ProfileListModel();
         profileList = new JList(model);
-        details = new ProfileDetailPanel(model, mainFrame);
+        details = new ProfileDetailPanel(model, mainFrame, this);
         addButton = new JButton("Add");
         deleteButton = new JButton("Delete");
         infoLabel =
-                new TextLabel("Profiles describe information needed to " +
-                "connect to a server.  You can use a different profile for " +
-                "each connection.");
+                new TextLabel("Profiles describe information needed to "
+                + "connect to a server.  You can use a different profile for "
+                + "each connection.");
 
         profileList.setCellRenderer(new ProfileListCellRenderer());
         profileList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
@@ -230,23 +232,44 @@ public final class ProfileManagerDialog extends StandardDialog implements Action
             dispose();
         } else if (e.getSource().equals(addButton)) {
             addProfile();
-        } else if (e.getSource().equals(deleteButton) && JOptionPane.showConfirmDialog(this,
-                "Are you sure you want to delete this profile?",
-                "Delete Confirmaton", JOptionPane.YES_NO_OPTION) ==
-                JOptionPane.YES_OPTION) {
-            final Profile selectedProfile = (Profile) profileList.getSelectedValue();
-            int selected = profileList.getSelectedIndex();
-            deletedProfiles.add(selectedProfile);
-            model.remove(selectedProfile);
-            final int profilesSize = profileList.getModel().getSize();
-            if (profilesSize == 0) {
-                selected = -1;
-            } else if (selected >= profilesSize) {
-                selected = profilesSize - 1;
-            } else if (selected <= 0) {
-                selected = 0;
-            }
-            profileList.setSelectedIndex(selected);
+        } else if (e.getSource().equals(deleteButton)) {
+            new StandardQuestionDialog(this, ModalityType.DOCUMENT_MODAL,
+                    "Delete Confirmaton",
+                    "Are you sure you want to delete this profile?") {
+
+                /**
+                 * 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;
+
+                /** {@inheritDoc} */
+                @Override
+                public boolean save() {
+                    final Profile selectedProfile = (Profile) profileList.
+                            getSelectedValue();
+                    int selected = profileList.getSelectedIndex();
+                    deletedProfiles.add(selectedProfile);
+                    model.remove(selectedProfile);
+                    final int profilesSize = profileList.getModel().getSize();
+                    if (profilesSize == 0) {
+                        selected = -1;
+                    } else if (selected >= profilesSize) {
+                        selected = profilesSize - 1;
+                    } else if (selected <= 0) {
+                        selected = 0;
+                    }
+                    profileList.setSelectedIndex(selected);
+                    return true;
+                }
+
+                /** {@inheritDoc} */
+                @Override
+                public void cancelled() {
+                    return;
+                }
+            }.display();
         }
     }
 

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

@@ -19,6 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
 package com.dmdirc.addons.ui_swing.dialogs.serversetting;
 
 import com.dmdirc.Server;
@@ -27,6 +28,7 @@ import com.dmdirc.config.prefs.validator.RegexValidator;
 import com.dmdirc.config.prefs.validator.ValidatorChain;
 import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
 import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 import com.dmdirc.parser.common.IgnoreList;
 
 import java.awt.Dialog.ModalityType;
@@ -38,7 +40,6 @@ import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JLabel;
 import javax.swing.JList;
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.ListSelectionModel;
@@ -126,7 +127,8 @@ public final class IgnoreListPanel extends JPanel implements ActionListener,
 
     /** Updates the size label. */
     private void updateSizeLabel() {
-        sizeLabel.setText(cachedIgnoreList.count() + " entr" + (cachedIgnoreList.count() == 1 ? "y" : "ies"));
+        sizeLabel.setText(cachedIgnoreList.count() + " entr" + (cachedIgnoreList.
+                count() == 1 ? "y" : "ies"));
     }
 
     /** Adds listeners to the components. */
@@ -165,16 +167,16 @@ public final class IgnoreListPanel extends JPanel implements ActionListener,
         server.saveIgnoreList();
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Action event
      */
     @SuppressWarnings("unchecked")
     @Override
     public void actionPerformed(final ActionEvent e) {
         if (e.getSource() == addButton) {
-            new StandardInputDialog(parentWindow, ModalityType.MODELESS, 
+            new StandardInputDialog(parentWindow, ModalityType.MODELESS,
                     "New ignore list entry",
                     "Please enter the new ignore list entry",
                     viewToggle.isSelected() ? new ValidatorChain<String>(
@@ -207,12 +209,35 @@ public final class IgnoreListPanel extends JPanel implements ActionListener,
                     //Ignore
                 }
             }.display();
-        } else if (e.getSource() == delButton && list.getSelectedIndex() != -1 && JOptionPane.showConfirmDialog(this,
-                "Are you sure you want to delete this item?",
-                "Delete Confirmation", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) {
-            cachedIgnoreList.remove(list.getSelectedIndex());
+        } else if (e.getSource() == delButton && list.getSelectedIndex()
+                != -1) {
+            new StandardQuestionDialog(parentWindow,
+                    ModalityType.APPLICATION_MODAL,
+                    "Confirm deletion",
+                    "Are you sure you want to delete this item?") {
+
+                /**
+                 * 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;
+
+                /** {@inheritDoc} */
+                @Override
+                public boolean save() {
+                    cachedIgnoreList.remove(list.getSelectedIndex());
+
+                    updateList();
+                    return true;
+                }
 
-            updateList();
+                /** {@inheritDoc} */
+                @Override
+                public void cancelled() {
+                    return;
+                }
+            }.display();
         } else if (e.getSource() == viewToggle) {
             listModel.setIsSimple(!viewToggle.isSelected());
         }