Add new profiles dialog.

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

@@ -26,12 +26,9 @@ import com.dmdirc.addons.ui_swing.Apple;
 import com.dmdirc.addons.ui_swing.dialogs.actionsmanager.ActionsManagerDialog;
 import com.dmdirc.addons.ui_swing.dialogs.aliases.AliasManagerDialog;
 import com.dmdirc.addons.ui_swing.dialogs.prefs.SwingPreferencesDialog;
-import com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog;
+import com.dmdirc.addons.ui_swing.dialogs.profile.ProfileManagerDialog;
 import com.dmdirc.addons.ui_swing.injection.DialogProvider;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.swing.JMenu;
@@ -41,12 +38,16 @@ import javax.swing.JMenuItem;
  * A menu to add settings related commands to the menu bar.
  */
 @Singleton
-public class SettingsMenu extends JMenu implements ActionListener {
+public class SettingsMenu extends JMenu {
 
     /** Serial version UID. */
     private static final long serialVersionUID = 1;
+    /** Old provider of profile manager dialogs. */
+    private final DialogProvider<com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog>
+            oldProfileDialogProvider;
     /** Provider of profile manager dialogs. */
-    private final DialogProvider<ProfileManagerDialog> profileDialogProvider;
+    private final DialogProvider<ProfileManagerDialog>
+            newProfileDialogProvider;
     /** Provider of action manager dialogs. */
     private final DialogProvider<ActionsManagerDialog> actionsDialogProvider;
     /** Provider of preferences dialogs. */
@@ -56,12 +57,16 @@ public class SettingsMenu extends JMenu implements ActionListener {
 
     @Inject
     public SettingsMenu(
-            final DialogProvider<ProfileManagerDialog> profileDialogProvider,
+            final DialogProvider<com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog>
+                    oldProfileDialogProvider,
+            final DialogProvider<ProfileManagerDialog>
+                    newProfileDialogProvider,
             final DialogProvider<ActionsManagerDialog> actionsDialogProvider,
             final DialogProvider<SwingPreferencesDialog> prefsDialogProvider,
             final DialogProvider<AliasManagerDialog> aliasDialogProvider) {
         super("Settings");
-        this.profileDialogProvider = profileDialogProvider;
+        this.oldProfileDialogProvider = oldProfileDialogProvider;
+        this.newProfileDialogProvider = newProfileDialogProvider;
         this.actionsDialogProvider = actionsDialogProvider;
         this.prefsDialogProvider = prefsDialogProvider;
         this.aliasDialogProvider = aliasDialogProvider;
@@ -78,51 +83,35 @@ public class SettingsMenu extends JMenu implements ActionListener {
 
         if (!Apple.isAppleUI()) {
             menuItem = new JMenuItem();
-            menuItem.setText("Preferences");
+            menuItem.setText("Settings");
             menuItem.setMnemonic('p');
-            menuItem.setActionCommand("Preferences");
-            menuItem.addActionListener(this);
+            menuItem.addActionListener(e -> prefsDialogProvider.displayOrRequestFocus());
             add(menuItem);
         }
 
         menuItem = new JMenuItem();
-        menuItem.setMnemonic('m');
-        menuItem.setText("Profile Manager");
-        menuItem.setActionCommand("Profile");
-        menuItem.addActionListener(this);
+        menuItem.setMnemonic('p');
+        menuItem.setText("Old Profile Manager");
+        menuItem.addActionListener(e -> oldProfileDialogProvider.displayOrRequestFocus());
+        add(menuItem);
+
+        menuItem = new JMenuItem();
+        menuItem.setMnemonic('p');
+        menuItem.setText("New Profile Manager");
+        menuItem.addActionListener(e -> newProfileDialogProvider.displayOrRequestFocus());
         add(menuItem);
 
         menuItem = new JMenuItem();
         menuItem.setMnemonic('a');
         menuItem.setText("Actions Manager");
-        menuItem.setActionCommand("Actions");
-        menuItem.addActionListener(this);
+        menuItem.addActionListener(e -> actionsDialogProvider.displayOrRequestFocus());
         add(menuItem);
 
         menuItem = new JMenuItem();
         menuItem.setMnemonic('l');
         menuItem.setText("Alias Manager");
-        menuItem.setActionCommand("Aliases");
-        menuItem.addActionListener(this);
+        menuItem.addActionListener(e -> aliasDialogProvider.displayOrRequestFocus());
         add(menuItem);
     }
 
-    @Override
-    public void actionPerformed(final ActionEvent e) {
-        switch (e.getActionCommand()) {
-            case "Preferences":
-                prefsDialogProvider.displayOrRequestFocus();
-                break;
-            case "Profile":
-                profileDialogProvider.displayOrRequestFocus();
-                break;
-            case "Actions":
-                actionsDialogProvider.displayOrRequestFocus();
-                break;
-            case "Aliases":
-                aliasDialogProvider.displayOrRequestFocus();
-                break;
-        }
-    }
-
 }

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/profile/ProfileIdentDocumentListener.java

@@ -0,0 +1,66 @@
+/*
+ * 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.profile;
+
+import com.dmdirc.interfaces.ui.ProfilesDialogModel;
+
+import java.util.Optional;
+
+import javax.swing.JTextField;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+
+/**
+* Applies changes in the profile ident's document to the model.
+*/
+public class ProfileIdentDocumentListener implements DocumentListener {
+
+    private final JTextField ident;
+    private final ProfilesDialogModel model;
+
+    public ProfileIdentDocumentListener(final ProfilesDialogModel model, final JTextField ident) {
+        this.ident = ident;
+        this.model = model;
+    }
+
+    @Override
+    public void insertUpdate(final DocumentEvent e) {
+        changed();
+    }
+
+    @Override
+    public void removeUpdate(final DocumentEvent e) {
+        changed();
+    }
+
+    @Override
+    public void changedUpdate(final DocumentEvent e) {
+        changed();
+    }
+
+    private void changed() {
+        if (model.getSelectedProfile().isPresent()) {
+            model.setSelectedProfileIdent(Optional.of(ident.getText()));
+        }
+    }
+}

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/profile/ProfileManagerController.java

@@ -0,0 +1,249 @@
+/*
+ * 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.profile;
+
+import com.dmdirc.addons.ui_swing.components.reorderablelist.ReorderableJList;
+import com.dmdirc.addons.ui_swing.components.vetoable.VetoableListSelectionModel;
+import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
+import com.dmdirc.interfaces.ui.ProfilesDialogModel;
+import com.dmdirc.interfaces.ui.ProfilesDialogModelListener;
+import com.dmdirc.ui.IconManager;
+import com.dmdirc.ui.core.profiles.MutableProfile;
+
+import com.google.common.collect.Lists;
+
+import java.awt.Dialog;
+import java.beans.PropertyVetoException;
+import java.util.Optional;
+
+import javax.swing.DefaultListModel;
+import javax.swing.JButton;
+import javax.swing.JList;
+import javax.swing.JTextField;
+import javax.swing.ListSelectionModel;
+
+public class ProfileManagerController implements ProfilesDialogModelListener {
+
+    private final ProfileManagerDialog dialog;
+    private final ProfilesDialogModel model;
+    private final IconManager iconManager;
+    private final DefaultListModel<MutableProfile> listModel;
+    private final VetoableListSelectionModel selectionModel;
+
+    public ProfileManagerController(final ProfileManagerDialog dialog,
+            final ProfilesDialogModel model, final IconManager iconManager) {
+        this.dialog = dialog;
+        this.model = model;
+        this.iconManager = iconManager;
+
+        listModel = (DefaultListModel<MutableProfile>) dialog.getProfileList().getModel();
+        selectionModel = new VetoableListSelectionModel();
+    }
+
+    public void init() {
+        model.loadModel();
+        setupOKButton(dialog.getOkButton());
+        setupCancelButton(dialog.getCancelButton());
+        setupProfileList(dialog.getProfileList());
+        setupAddProfile(dialog.getAddProfile());
+        setupDeleteProfile(dialog.getDeleteProfile());
+        setupEditNickname(dialog.getProfileEditNickname());
+        setupAddNickname(dialog.getProfileAddNickname());
+        setupDeleteNickname(dialog.getProfileDeleteNickname());
+        setupProfileName(dialog.getProfileName());
+        setupProfileNicknames(dialog.getProfileNicknames());
+        setupProfileRealname(dialog.getProfileRealname());
+        setupProfileIdent(dialog.getProfileIdent());
+        model.addListener(this);
+    }
+
+    private void setupOKButton(final JButton okButton) {
+        okButton.setEnabled(model.isSaveAllowed());
+        okButton.addActionListener(l -> {
+            model.save();
+            dialog.dispose();
+        });
+    }
+
+    private void setupCancelButton(final JButton cancelButton) {
+        cancelButton.addActionListener(l -> dialog.dispose());
+    }
+
+    private void setupProfileList(final JList<MutableProfile> profileList) {
+        profileList.setSelectionModel(selectionModel);
+        model.getProfileList().forEach(listModel::addElement);
+        selectionModel.addVetoableSelectionListener(e -> {
+            if (!model.canSwitchProfiles()) {
+                throw new PropertyVetoException("Cannot switch with invalid profile", e);
+            }
+        });
+        profileList.addListSelectionListener(l -> {
+            if (!selectionModel.isSelectionEmpty()) {
+                model.setSelectedProfile(Optional.ofNullable(profileList.getSelectedValue()));
+            }
+        });
+        if (model.getSelectedProfileNicknames().isPresent()) {
+            model.getSelectedProfileNicknames().get().forEach(
+                    p -> dialog.getProfileNicknames().getModel().addElement(p));
+        }
+        if (!listModel.isEmpty()) {
+            selectionModel.setLeadSelectionIndex(0);
+        }
+    }
+
+    private void setupAddProfile(final JButton addProfile) {
+        addProfile.addActionListener(
+                e -> new StandardInputDialog(dialog, Dialog.ModalityType.DOCUMENT_MODAL,
+                        iconManager, "Profile Manager: Add Profile", "Enter the new profile's name",
+                        model.getNewProfileNameValidator(),
+                        (String s) -> model.addProfile(s, s, s, Lists.newArrayList(s))).display());
+    }
+
+    private void setupDeleteProfile(final JButton deleteProfile) {
+        deleteProfile.setEnabled(model.getSelectedProfile().isPresent());
+        deleteProfile.addActionListener(l -> model.getSelectedProfile()
+                .ifPresent(p -> model.removeProfile(p.getName())));
+    }
+
+    private void setupEditNickname(final JButton editNickname) {
+        editNickname.setEnabled(model.getSelectedProfileSelectedNickname().isPresent());
+        editNickname.addActionListener(l -> model.getSelectedProfileSelectedNickname().ifPresent(
+                (String oldName) -> new StandardInputDialog(dialog,
+                        Dialog.ModalityType.DOCUMENT_MODAL, iconManager,
+                        "Profile Manager: Edit Nickname", "Enter new nickname",
+                        (String newName) -> model.editSelectedProfileNickname(oldName, newName))
+                        .display()));
+    }
+
+    private void setupAddNickname(final JButton addNickname) {
+        addNickname.setEnabled(!model.getProfileList().isEmpty());
+        addNickname.addActionListener(
+                e -> new StandardInputDialog(dialog, Dialog.ModalityType.DOCUMENT_MODAL,
+                        iconManager, "Profile Manager: Add Nickname", "Enter nickname to add",
+                        model::addSelectedProfileNickname).display());
+    }
+
+    private void setupDeleteNickname(final JButton deleteNickname) {
+        deleteNickname.setEnabled(model.getSelectedProfileSelectedNickname().isPresent());
+        deleteNickname.addActionListener(l -> model.getSelectedProfileSelectedNickname()
+                .ifPresent(model::removeSelectedProfileNickname));
+    }
+
+    private void setupProfileName(final JTextField name) {
+        name.setEnabled(model.getSelectedProfileName().isPresent());
+        name.setText(model.getSelectedProfileName().orElse(""));
+        name.getDocument().addDocumentListener(new ProfileNameDocumentListener(model, name));
+    }
+
+    private void setupProfileNicknames(final ReorderableJList<String> nicknames) {
+        nicknames.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+        nicknames.setEnabled(model.getSelectedProfileNicknames().isPresent());
+        nicknames.addListSelectionListener(l -> model.setSelectedProfileSelectedNickname(
+                Optional.ofNullable(nicknames.getSelectedValue())));
+    }
+
+    private void setupProfileRealname(final JTextField realname) {
+        realname.setEnabled(model.getSelectedProfileRealname().isPresent());
+        realname.setText(model.getSelectedProfileRealname().orElse(""));
+        realname.getDocument().addDocumentListener(
+                new ProfileRealnameDocumentListener(model, realname));
+    }
+
+    private void setupProfileIdent(final JTextField ident) {
+        ident.setEnabled(model.getSelectedProfileIdent().isPresent());
+        ident.setText(model.getSelectedProfileIdent().orElse(""));
+        ident.getDocument().addDocumentListener(new ProfileIdentDocumentListener(model, ident));
+    }
+
+    @Override
+    public void profileAdded(final MutableProfile profile) {
+        dialog.getProfileAddNickname().setEnabled(model.isProfileListValid());
+        dialog.getOkButton().setEnabled(model.isSaveAllowed());
+        listModel.addElement(profile);
+    }
+
+    @Override
+    public void profileRemoved(final MutableProfile profile) {
+        dialog.getProfileAddNickname().setEnabled(model.isProfileListValid());
+        dialog.getOkButton().setEnabled(model.isSaveAllowed());
+        listModel.removeElement(profile);
+    }
+
+    @Override
+    public void profileEdited(final MutableProfile profile) {
+        dialog.getOkButton().setEnabled(model.isSaveAllowed());
+    }
+
+    @Override
+    public void profileSelectionChanged(final Optional<MutableProfile> profile) {
+        dialog.getOkButton().setEnabled(model.isSaveAllowed());
+        dialog.getDeleteProfile().setEnabled(model.getSelectedProfile().isPresent());
+        if (profile.isPresent()) {
+            final int index = listModel.indexOf(profile.get());
+            selectionModel.setLeadSelectionIndex(index);
+        } else {
+            selectionModel.setLeadSelectionIndex(-1);
+        }
+        dialog.getProfileName().setEnabled(model.getSelectedProfileIdent().isPresent());
+        dialog.getProfileName().setText(model.getSelectedProfileName().orElse(""));
+        dialog.getProfileNicknames().setEnabled(model.getSelectedProfileNicknames().isPresent());
+        dialog.getProfileNicknames().getModel().clear();
+        if (model.getSelectedProfileNicknames().isPresent()) {
+            model.getSelectedProfileNicknames().get().forEach(
+                    p -> dialog.getProfileNicknames().getModel().addElement(p));
+        }
+        dialog.getProfileRealname().setEnabled(model.getSelectedProfileRealname().isPresent());
+        dialog.getProfileRealname().setText(model.getSelectedProfileRealname().orElse(""));
+        dialog.getProfileIdent().setEnabled(model.getSelectedProfile().isPresent());
+        dialog.getProfileIdent().setText(model.getSelectedProfileIdent().orElse(""));
+    }
+
+    @Override
+    public void selectedNicknameChanged(final Optional<String> nickname) {
+        dialog.getOkButton().setEnabled(model.isSaveAllowed());
+        dialog.getProfileDeleteNickname()
+                .setEnabled(model.getSelectedProfileSelectedNickname().isPresent());
+        dialog.getProfileEditNickname()
+                .setEnabled(model.getSelectedProfileSelectedNickname().isPresent());
+    }
+
+    @Override
+    public void selectedProfileNicknameEdited(final String oldNickname, final String newNickname) {
+        dialog.getOkButton().setEnabled(model.isSaveAllowed());
+        dialog.getProfileNicknames().getModel()
+                .setElementAt(newNickname, dialog.getProfileNicknames().getModel().indexOf(oldNickname));
+    }
+
+    @Override
+    public void selectedProfileNicknameAdded(final String nickname) {
+        dialog.getOkButton().setEnabled(model.isSaveAllowed());
+        dialog.getProfileNicknames().getModel().addElement(nickname);
+    }
+
+    @Override
+    public void selectedProfileNicknameRemoved(final String nickname) {
+        dialog.getOkButton().setEnabled(model.isSaveAllowed());
+        dialog.getProfileNicknames().getModel().removeElement(nickname);
+    }
+
+}

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

@@ -0,0 +1,175 @@
+/*
+ * 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.profile;
+
+import com.dmdirc.ClientModule.GlobalConfig;
+import com.dmdirc.addons.ui_swing.components.renderers.PropertyListCellRenderer;
+import com.dmdirc.addons.ui_swing.components.reorderablelist.ReorderableJList;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
+import com.dmdirc.addons.ui_swing.components.validating.ValidationFactory;
+import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
+import com.dmdirc.addons.ui_swing.injection.MainWindow;
+import com.dmdirc.interfaces.ui.ProfilesDialogModel;
+import com.dmdirc.ui.IconManager;
+import com.dmdirc.ui.core.profiles.MutableProfile;
+
+import java.awt.Window;
+
+import javax.inject.Inject;
+import javax.swing.Box;
+import javax.swing.DefaultListModel;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JScrollPane;
+import javax.swing.JTextField;
+
+import net.miginfocom.swing.MigLayout;
+
+public class ProfileManagerDialog extends StandardDialog {
+
+    /** Serial version UID. */
+    private static final long serialVersionUID = 3;
+    /** Model used to store state. */
+    private final ProfilesDialogModel model;
+    /** Icon manager. */
+    private final IconManager iconManager;
+    /** List of profiles. */
+    private final JList<MutableProfile> profileList = new JList<>(new DefaultListModel<>());
+    /** List of nicknames for a profile. */
+    private final ReorderableJList<String> nicknames = new ReorderableJList<>();
+    /** Adds a new nickname to the active profile. */
+    private final JButton addNickname = new JButton("Add");
+    /** Edits the active nickname in the active profile. */
+    private final JButton editNickname = new JButton("Edit");
+    /** Deletes the selected nickname from the active profile. */
+    private final JButton deleteNickname = new JButton("Delete");
+    /** Edits the name of the active profile. */
+    private final JTextField name = new JTextField();
+    /** Edits the realname for the active profile. */
+    private final JTextField realname = new JTextField();
+    /** Edits the ident for the active profile. */
+    private final JTextField ident = new JTextField();
+    /** Adds a new profile to the list. */
+    private final JButton addProfile = new JButton("Add");
+    /** Deletes the active profile. */
+    private final JButton deleteProfile = new JButton("Delete");
+
+    /**
+     * Creates a new instance of ProfileEditorDialog.
+     *
+     * @param mainFrame   Main frame
+     * @param model       Profiles model
+     * @param iconManager Icon manager to retrieve icons
+     */
+    @Inject
+    public ProfileManagerDialog(@MainWindow final Window mainFrame, final ProfilesDialogModel model,
+            @GlobalConfig final IconManager iconManager) {
+        super(mainFrame, ModalityType.DOCUMENT_MODAL);
+        setTitle("Profile Manager");
+        this.model = model;
+        this.iconManager = iconManager;
+        initComponents();
+    }
+
+    /** Initialises the components. */
+    private void initComponents() {
+        profileList.setCellRenderer(new PropertyListCellRenderer<>(profileList.getCellRenderer(),
+                MutableProfile.class, "name"));
+        setLayout(new MigLayout("fill, wmin 700, wmax 700, flowy"));
+
+        add(new TextLabel("Profiles describe the information needed to connect " +
+                "to a server.  You can use a different profile for each " + "connection."),
+                "spanx 3");
+        add(new JScrollPane(profileList), "spany 3, growy, " + "wmin 200, wmax 200");
+        add(addProfile, "grow");
+        add(deleteProfile, "grow, wrap");
+        add(new JLabel("Name: "), "align label, span 2, split 2, flowx, sgx label");
+        add(ValidationFactory
+                .getValidatorPanel(name, model.getSelectedProfileNameValidator(), iconManager),
+                "growx, pushx, sgx textinput");
+        add(new JLabel("Nicknames: "),
+                "align label, span 2, split 2, flowx, sgx label, aligny 50%");
+        add(ValidationFactory.getValidatorPanel(new JScrollPane(nicknames), nicknames,
+                model.getNicknamesValidator(), iconManager), "grow, push");
+        add(Box.createGlue(), "flowx, span 4, split 4, sgx label");
+        add(addNickname, "grow");
+        add(editNickname, "grow");
+        add(deleteNickname, "grow");
+        add(new JLabel("Realname: "), "align label, span 2, split 2, flowx, sgx label");
+        add(ValidationFactory
+                .getValidatorPanel(realname, model.getRealnameValidator(), iconManager),
+                "growx, pushx, sgx textinput");
+        add(new JLabel("Ident: "), "align label, span 2, split 2, flowx, sgx label");
+        add(ValidationFactory.getValidatorPanel(ident, model.getIdentValidator(), iconManager),
+                "growx, pushx, sgx textinput");
+        add(getLeftButton(), "flowx, split 2, right, sg button");
+        add(getRightButton(), "right, sg button");
+    }
+
+    @Override
+    public void display() {
+        new ProfileManagerController(this, model, iconManager).init();
+        super.display();
+    }
+
+    public JList<MutableProfile> getProfileList() {
+        return profileList;
+    }
+
+    public ReorderableJList<String> getProfileNicknames() {
+        return nicknames;
+    }
+
+    public JButton getProfileAddNickname() {
+        return addNickname;
+    }
+
+    public JButton getProfileEditNickname() {
+        return editNickname;
+    }
+
+    public JButton getProfileDeleteNickname() {
+        return deleteNickname;
+    }
+
+    public JTextField getProfileName() {
+        return name;
+    }
+
+    public JTextField getProfileIdent() {
+        return ident;
+    }
+
+    public JTextField getProfileRealname() {
+        return realname;
+    }
+
+    public JButton getAddProfile() {
+        return addProfile;
+    }
+
+    public JButton getDeleteProfile() {
+        return deleteProfile;
+    }
+}

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

@@ -0,0 +1,362 @@
+/*
+ * 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.profile;
+
+import com.dmdirc.addons.ui_swing.components.reorderablelist.ReorderableJList;
+import com.dmdirc.addons.ui_swing.components.vetoable.VetoableListSelectionModel;
+import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
+import com.dmdirc.interfaces.ui.ProfilesDialogModel;
+import com.dmdirc.ui.IconManager;
+import com.dmdirc.ui.core.profiles.MutableProfile;
+import com.dmdirc.ui.core.profiles.ProfilesDialogModelAdapter;
+
+import com.google.common.collect.Lists;
+
+import java.awt.Dialog;
+import java.beans.PropertyVetoException;
+import java.util.Optional;
+
+import javax.swing.DefaultListModel;
+import javax.swing.JButton;
+import javax.swing.JList;
+import javax.swing.JTextField;
+import javax.swing.ListSelectionModel;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+
+public class ProfileManagerDialogLinker {
+
+    private final ProfileManagerDialog dialog;
+    private final ProfilesDialogModel model;
+    private final IconManager iconManager;
+
+    public ProfileManagerDialogLinker(final ProfileManagerDialog dialog,
+            final ProfilesDialogModel model,
+            final IconManager iconManager) {
+        this.dialog = dialog;
+        this.model = model;
+        this.iconManager = iconManager;
+    }
+
+    public void bindAddNickname(final JButton addNickname) {
+        addNickname.setEnabled(!model.getProfileList().isEmpty());
+        model.addListener(new ProfilesDialogModelAdapter() {
+
+            @Override
+            public void profileRemoved(final MutableProfile profile) {
+                addNickname.setEnabled(model.isProfileListValid());
+            }
+
+            @Override
+            public void profileAdded(final MutableProfile profile) {
+                addNickname.setEnabled(model.isProfileListValid());
+            }
+        });
+        addNickname.addActionListener(e -> new StandardInputDialog(dialog,
+                Dialog.ModalityType.DOCUMENT_MODAL, iconManager, "Profile Manager: Add Nickname",
+                "Enter nickname to add", model::addSelectedProfileNickname
+        ).display());
+    }
+
+    public void bindAddProfile(final JButton addProfile) {
+        addProfile.addActionListener(e -> new StandardInputDialog(dialog,
+                Dialog.ModalityType.DOCUMENT_MODAL, iconManager, "Profile Manager: Add Profile",
+                "Enter the new profile's name",
+                (String s) -> model.addProfile(s, s, s, Lists.newArrayList(s))
+        ).display());
+    }
+
+    public void bindCancelButton(final JButton cancelButton) {
+        cancelButton.addActionListener(l -> dialog.dispose());
+    }
+
+    public void bindOKButton(final JButton okButton) {
+        okButton.setEnabled(model.isSaveAllowed());
+        model.addListener(new ProfilesDialogModelAdapter() {
+
+            @Override
+            public void profileAdded(final MutableProfile profile) {
+                okButton.setEnabled(model.isSaveAllowed());
+            }
+
+            @Override
+            public void profileRemoved(final MutableProfile profile) {
+                okButton.setEnabled(model.isSaveAllowed());
+            }
+
+            @Override
+            public void profileEdited(final MutableProfile profile) {
+                okButton.setEnabled(model.isSaveAllowed());
+            }
+
+            @Override
+            public void profileSelectionChanged(final Optional<MutableProfile> profile) {
+                okButton.setEnabled(model.isSaveAllowed());
+            }
+
+            @Override
+            public void selectedNicknameChanged(final Optional<String> nickname) {
+                okButton.setEnabled(model.isSaveAllowed());
+            }
+
+            @Override
+            public void selectedProfileNicknameEdited(final String oldNickname,
+                    final String newNickname) {
+                okButton.setEnabled(model.isSaveAllowed());
+            }
+
+            @Override
+            public void selectedProfileNicknameAdded(final String nickname) {
+                okButton.setEnabled(model.isSaveAllowed());
+            }
+
+            @Override
+            public void selectedProfileNicknameRemoved(final String nickname) {
+                okButton.setEnabled(model.isSaveAllowed());
+            }
+        });
+        okButton.addActionListener(l -> {
+            model.save();
+            dialog.dispose();
+        });
+    }
+
+    public void bindDeleteNickname(final JButton deleteNickname) {
+        deleteNickname.setEnabled(model.getSelectedProfileSelectedNickname().isPresent());
+        deleteNickname.addActionListener(l -> model.getSelectedProfileSelectedNickname()
+                .ifPresent(model::removeSelectedProfileNickname));
+        model.addListener(new ProfilesDialogModelAdapter() {
+            @Override
+            public void selectedNicknameChanged(final Optional<String> nickname) {
+                deleteNickname.setEnabled(model.getSelectedProfileSelectedNickname().isPresent());
+            }
+        });
+    }
+
+    public void bindDeleteProfile(final JButton deleteProfile) {
+        deleteProfile.setEnabled(model.getSelectedProfile().isPresent());
+        deleteProfile.addActionListener(l -> model.getSelectedProfile()
+                .ifPresent(p -> model.removeProfile(p.getName())));
+        model.addListener(new ProfilesDialogModelAdapter() {
+            @Override
+            public void profileSelectionChanged(final Optional<MutableProfile> profile) {
+                deleteProfile.setEnabled(model.getSelectedProfile().isPresent());
+            }
+        });
+    }
+
+    public void bindEditNickname(final JButton editNickname) {
+        editNickname.setEnabled(model.getSelectedProfileSelectedNickname().isPresent());
+        editNickname.addActionListener(l -> model.getSelectedProfileSelectedNickname().ifPresent(
+                (String oldName) -> new StandardInputDialog(dialog,
+                        Dialog.ModalityType.DOCUMENT_MODAL, iconManager,
+                        "Profile Manager: Edit Nickname", "Enter new nickname",
+                        (String newName) -> model.editSelectedProfileNickname(oldName, newName))
+                        .display()));
+        model.addListener(new ProfilesDialogModelAdapter() {
+            @Override
+            public void selectedNicknameChanged(final Optional<String> nickname) {
+                editNickname.setEnabled(model.getSelectedProfileSelectedNickname().isPresent());
+            }
+        });
+    }
+
+    public void bindProfileList(final JList<MutableProfile> profileList) {
+        final DefaultListModel<MutableProfile> listModel
+                = (DefaultListModel<MutableProfile>) profileList.getModel();
+        final VetoableListSelectionModel selectionModel = new VetoableListSelectionModel();
+        profileList.setSelectionModel(selectionModel);
+        model.getProfileList().forEach(listModel::addElement);
+        model.addListener(new ProfilesDialogModelAdapter() {
+
+            @Override
+            public void profileRemoved(final MutableProfile profile) {
+                listModel.removeElement(profile);
+            }
+
+            @Override
+            public void profileAdded(final MutableProfile profile) {
+                listModel.addElement(profile);
+            }
+
+            @Override
+            public void profileSelectionChanged(final Optional<MutableProfile> profile) {
+                if (profile.isPresent()) {
+                    final int index = listModel.indexOf(profile.get());
+                    selectionModel.setLeadSelectionIndex(index);
+                } else {
+                    selectionModel.setLeadSelectionIndex(-1);
+                }
+            }
+        });
+        selectionModel.addVetoableSelectionListener(e -> {
+            if (!model.canSwitchProfiles()) {
+                throw new PropertyVetoException("Cannot switch with invalid profile", e);
+            }
+        });
+        profileList.addListSelectionListener(l -> model.setSelectedProfile(
+                Optional.ofNullable(profileList.getSelectedValue())));
+    }
+
+    public void bindProfileIdent(final JTextField ident) {
+        ident.setEnabled(model.getSelectedProfileIdent().isPresent());
+        model.addListener(new ProfilesDialogModelAdapter() {
+
+            @Override
+            public void profileSelectionChanged(final Optional<MutableProfile> profile) {
+                ident.setEnabled(model.getSelectedProfile().isPresent());
+                ident.setText(model.getSelectedProfileIdent().orElse(""));
+            }
+        });
+        ident.getDocument().addDocumentListener(new DocumentListener() {
+
+            @Override
+            public void insertUpdate(final DocumentEvent e) {
+                changed();
+            }
+
+            @Override
+            public void removeUpdate(final DocumentEvent e) {
+                changed();
+            }
+
+            @Override
+            public void changedUpdate(final DocumentEvent e) {
+                changed();
+            }
+
+            private void changed() {
+                if (model.getSelectedProfile().isPresent()) {
+                    model.setSelectedProfileIdent(Optional.of(ident.getText()));
+                }
+            }
+        });
+    }
+
+    public void bindProfileName(final JTextField name) {
+        name.setEnabled(model.getSelectedProfileName().isPresent());
+        model.addListener(new ProfilesDialogModelAdapter() {
+
+            @Override
+            public void profileSelectionChanged(final Optional<MutableProfile> profile) {
+                name.setEnabled(model.getSelectedProfileIdent().isPresent());
+                name.setText(model.getSelectedProfileName().orElse(""));
+            }
+        });
+        name.getDocument().addDocumentListener(new DocumentListener() {
+
+            @Override
+            public void insertUpdate(final DocumentEvent e) {
+                changed();
+            }
+
+            @Override
+            public void removeUpdate(final DocumentEvent e) {
+                changed();
+            }
+
+            @Override
+            public void changedUpdate(final DocumentEvent e) {
+                changed();
+            }
+
+            private void changed() {
+                if (model.getSelectedProfile().isPresent()) {
+                    model.setSelectedProfileName(Optional.ofNullable(name.getText()));
+                }
+            }
+        });
+    }
+
+    public void bindProfileNicknames(final ReorderableJList<String> nicknames) {
+        nicknames.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+        nicknames.setEnabled(model.getSelectedProfileNicknames().isPresent());
+        model.addListener(new ProfilesDialogModelAdapter() {
+
+            @Override
+            public void profileSelectionChanged(final Optional<MutableProfile> profile) {
+                nicknames.setEnabled(model.getSelectedProfileNicknames().isPresent());
+                nicknames.getModel().clear();
+                if (model.getSelectedProfileNicknames().isPresent()) {
+                    model.getSelectedProfileNicknames().get().forEach(p ->
+                            nicknames.getModel().addElement(p)
+                    );
+                }
+            }
+
+            @Override
+            public void selectedProfileNicknameAdded(final String nickname) {
+                nicknames.getModel().addElement(nickname);
+            }
+
+            @Override
+            public void selectedProfileNicknameRemoved(final String nickname) {
+                nicknames.getModel().removeElement(nickname);
+            }
+
+            @Override
+            public void selectedProfileNicknameEdited(final String oldNickname,
+                    final String newNickname) {
+                nicknames.getModel().setElementAt(newNickname,
+                        nicknames.getModel().indexOf(oldNickname));
+            }
+        });
+        nicknames.addListSelectionListener(l -> model.setSelectedProfileSelectedNickname(
+                Optional.ofNullable(nicknames.getSelectedValue())));
+    }
+
+    public void bindProfileRealnames(final JTextField realname) {
+        realname.setEnabled(model.getSelectedProfileRealname().isPresent());
+        model.addListener(new ProfilesDialogModelAdapter() {
+
+            @Override
+            public void profileSelectionChanged(final Optional<MutableProfile> profile) {
+                realname.setEnabled(model.getSelectedProfileRealname().isPresent());
+                realname.setText(model.getSelectedProfileRealname().orElse(""));
+            }
+        });
+        realname.getDocument().addDocumentListener(new DocumentListener() {
+
+            @Override
+            public void insertUpdate(final DocumentEvent e) {
+                changed();
+            }
+
+            @Override
+            public void removeUpdate(final DocumentEvent e) {
+                changed();
+            }
+
+            @Override
+            public void changedUpdate(final DocumentEvent e) {
+                changed();
+            }
+
+            private void changed() {
+                if (model.getSelectedProfile().isPresent()) {
+                    model.setSelectedProfileRealname(Optional.of(realname.getText()));
+                }
+            }
+        });
+    }
+}

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/profile/ProfileNameDocumentListener.java

@@ -0,0 +1,66 @@
+/*
+ * 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.profile;
+
+import com.dmdirc.interfaces.ui.ProfilesDialogModel;
+
+import java.util.Optional;
+
+import javax.swing.JTextField;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+
+/**
+* Applies changes in the profile name's document to the model.
+*/
+public class ProfileNameDocumentListener implements DocumentListener {
+
+    private final JTextField name;
+    private final ProfilesDialogModel model;
+
+    public ProfileNameDocumentListener(final ProfilesDialogModel model, final JTextField name) {
+        this.name = name;
+        this.model = model;
+    }
+
+    @Override
+    public void insertUpdate(final DocumentEvent e) {
+        changed();
+    }
+
+    @Override
+    public void removeUpdate(final DocumentEvent e) {
+        changed();
+    }
+
+    @Override
+    public void changedUpdate(final DocumentEvent e) {
+        changed();
+    }
+
+    private void changed() {
+        if (model.isSelectedProfileNameValid()) {
+            model.setSelectedProfileName(Optional.ofNullable(name.getText()));
+        }
+    }
+}

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/profile/ProfileRealnameDocumentListener.java

@@ -0,0 +1,67 @@
+/*
+ * 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.profile;
+
+import com.dmdirc.interfaces.ui.ProfilesDialogModel;
+
+import java.util.Optional;
+
+import javax.swing.JTextField;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+
+/**
+* Applies changes in the profile realname's document to the model.
+*/
+public class ProfileRealnameDocumentListener implements DocumentListener {
+
+    private final JTextField realname;
+    private final ProfilesDialogModel model;
+
+    public ProfileRealnameDocumentListener(final ProfilesDialogModel model,
+            final JTextField realname) {
+        this.realname = realname;
+        this.model = model;
+    }
+
+    @Override
+    public void insertUpdate(final DocumentEvent e) {
+        changed();
+    }
+
+    @Override
+    public void removeUpdate(final DocumentEvent e) {
+        changed();
+    }
+
+    @Override
+    public void changedUpdate(final DocumentEvent e) {
+        changed();
+    }
+
+    private void changed() {
+        if (model.getSelectedProfile().isPresent()) {
+            model.setSelectedProfileRealname(Optional.of(realname.getText()));
+        }
+    }
+}

ui_swing/src/com/dmdirc/addons/ui_swing/injection/DialogModule.java

@@ -38,7 +38,7 @@ import com.dmdirc.addons.ui_swing.dialogs.error.ErrorListDialog;
 import com.dmdirc.addons.ui_swing.dialogs.feedback.FeedbackDialog;
 import com.dmdirc.addons.ui_swing.dialogs.newserver.NewServerDialog;
 import com.dmdirc.addons.ui_swing.dialogs.prefs.SwingPreferencesDialog;
-import com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog;
+import com.dmdirc.addons.ui_swing.dialogs.profile.ProfileManagerDialog;
 import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
 import com.dmdirc.addons.ui_swing.dialogs.updater.SwingRestartDialog;
 import com.dmdirc.addons.ui_swing.dialogs.updater.SwingUpdaterDialog;
@@ -51,10 +51,12 @@ import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.interfaces.ui.AliasDialogModel;
 import com.dmdirc.interfaces.ui.FeedbackDialogModel;
 import com.dmdirc.interfaces.ui.NewServerDialogModel;
+import com.dmdirc.interfaces.ui.ProfilesDialogModel;
 import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.ui.core.aliases.CoreAliasDialogModel;
 import com.dmdirc.ui.core.feedback.CoreFeedbackDialogModel;
 import com.dmdirc.ui.core.newserver.CoreNewServerDialogModel;
+import com.dmdirc.ui.core.profiles.CoreProfilesDialogModel;
 import com.dmdirc.ui.input.TabCompleterUtils;
 import com.dmdirc.ui.messages.ColourManagerFactory;
 
@@ -103,6 +105,11 @@ public class DialogModule {
         return model;
     }
 
+    @Provides
+    public ProfilesDialogModel getProfileDialogModel(final CoreProfilesDialogModel model) {
+        return model;
+    }
+
     @Provides
     @Singleton
     public DialogProvider<NewServerDialog> getNewServerDialogProvider(
@@ -112,7 +119,14 @@ public class DialogModule {
 
     @Provides
     @Singleton
-    public DialogProvider<ProfileManagerDialog> getProfileManagerDialogProvider(
+    public DialogProvider<com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog> getOldProfileManagerDialogProvider(
+            final Provider<com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog> provider) {
+        return new DialogProvider<>(provider);
+    }
+
+    @Provides
+    @Singleton
+    public DialogProvider<ProfileManagerDialog> getNewProfileManagerDialogProvider(
             final Provider<ProfileManagerDialog> provider) {
         return new DialogProvider<>(provider);
     }