Delete old profiles dialog.

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

@@ -42,12 +42,8 @@ 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>
-            newProfileDialogProvider;
+    private final DialogProvider<ProfileManagerDialog> profileDialogProvider;
     /** Provider of action manager dialogs. */
     private final DialogProvider<ActionsManagerDialog> actionsDialogProvider;
     /** Provider of preferences dialogs. */
@@ -57,16 +53,12 @@ public class SettingsMenu extends JMenu {
 
     @Inject
     public SettingsMenu(
-            final DialogProvider<com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog>
-                    oldProfileDialogProvider,
-            final DialogProvider<ProfileManagerDialog>
-                    newProfileDialogProvider,
+            final DialogProvider<ProfileManagerDialog> profileDialogProvider,
             final DialogProvider<ActionsManagerDialog> actionsDialogProvider,
             final DialogProvider<SwingPreferencesDialog> prefsDialogProvider,
             final DialogProvider<AliasManagerDialog> aliasDialogProvider) {
         super("Settings");
-        this.oldProfileDialogProvider = oldProfileDialogProvider;
-        this.newProfileDialogProvider = newProfileDialogProvider;
+        this.profileDialogProvider = profileDialogProvider;
         this.actionsDialogProvider = actionsDialogProvider;
         this.prefsDialogProvider = prefsDialogProvider;
         this.aliasDialogProvider = aliasDialogProvider;
@@ -91,14 +83,8 @@ public class SettingsMenu extends JMenu {
 
         menuItem = new JMenuItem();
         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());
+        menuItem.setText("Profile Manager");
+        menuItem.addActionListener(e -> profileDialogProvider.displayOrRequestFocus());
         add(menuItem);
 
         menuItem = new JMenuItem();

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/newserver/NewServerDialog.java

@@ -27,11 +27,10 @@ import com.dmdirc.addons.ui_swing.components.NoBorderJCheckBox;
 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.dialogs.profiles.ProfileManagerDialog;
+import com.dmdirc.addons.ui_swing.dialogs.profile.ProfileManagerDialog;
 import com.dmdirc.addons.ui_swing.injection.DialogProvider;
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.config.profiles.Profile;
-import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.ui.NewServerDialogModel;
 import com.dmdirc.ui.IconManager;
 

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/newserver/NewServerLinker.java

@@ -24,7 +24,7 @@ package com.dmdirc.addons.ui_swing.dialogs.newserver;
 
 import com.dmdirc.addons.ui_swing.components.renderers.PropertyListCellRenderer;
 import com.dmdirc.addons.ui_swing.components.vetoable.VetoableComboBoxModel;
-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 com.dmdirc.config.profiles.Profile;
 import com.dmdirc.interfaces.ui.NewServerDialogModel;

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

@@ -1,53 +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.profiles;
-
-import com.dmdirc.util.validators.NicknameValidator;
-import com.dmdirc.util.validators.ValidationResponse;
-
-/**
- * Validates new nicknames being added to a profile.
- */
-public class AddNicknameValidator extends NicknameValidator {
-
-    /** Model used to query for validation. */
-    private final ProfileManagerModel model;
-
-    /**
-     * Creates a new add nickname validator.
-     *
-     * @param model Model used to query for information
-     */
-    public AddNicknameValidator(final ProfileManagerModel model) {
-        this.model = model;
-    }
-
-    @Override
-    public ValidationResponse validate(final String object) {
-        if (model.getNicknames().contains(object)) {
-            return new ValidationResponse("Duplicate nickname exists");
-        }
-        return super.validate(object);
-    }
-
-}

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

@@ -1,54 +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.profiles;
-
-import com.dmdirc.util.validators.ValidationResponse;
-
-/**
- * Validates a nickname that is being edited.
- */
-public class EditNicknameValidator extends AddNicknameValidator {
-
-    /** Model used to query for validation. */
-    private final ProfileManagerModel model;
-
-    /**
-     * Creates a new edit nickname validator.
-     *
-     * @param model Model used to query for information
-     */
-    public EditNicknameValidator(final ProfileManagerModel model) {
-        super(model);
-        this.model = model;
-    }
-
-    @Override
-    public ValidationResponse validate(final String object) {
-        final String nickname = (String) model.getSelectedNickname();
-        if (nickname == null || nickname.equals(object)) {
-            return new ValidationResponse();
-        }
-        return super.validate(object);
-    }
-
-}

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

@@ -1,104 +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.profiles;
-
-import com.dmdirc.actions.wrappers.Profile;
-import com.dmdirc.interfaces.config.IdentityFactory;
-
-/**
- * This controller reacts to all actions in the profile manager dialog.
- */
-public class ProfileManagerController {
-
-    /** Dialog shown to user. */
-    private final ProfileManagerDialog dialog;
-    /** Model used to store state. */
-    private final ProfileManagerModel model;
-    /** Factory to use when creating new profiles. */
-    private final IdentityFactory identityFactory;
-
-    public ProfileManagerController(final ProfileManagerDialog dialog,
-            final ProfileManagerModel model, final IdentityFactory identityFactory) {
-        this.dialog = dialog;
-        this.model = model;
-        this.identityFactory = identityFactory;
-    }
-
-    /**
-     * Adds a new profile.
-     *
-     * @param name Name of the profile
-     */
-    public void addProfile(final String name) {
-        model.addProfile(new Profile(name, identityFactory));
-    }
-
-    /** Deletes the active profile. */
-    public void deleteProfile() {
-        model.deleteProfile((Profile) model.getSelectedProfile());
-        if (model.getProfiles().isEmpty()) {
-            model.addProfile(new Profile("New Profile", identityFactory));
-        }
-    }
-
-    /**
-     * Adds the specified nickname.
-     *
-     * @param nickname New nickname
-     */
-    public void addNickname(final String nickname) {
-        model.addNickname(nickname);
-    }
-
-    /**
-     * Edits the selected nickname.
-     *
-     * @param nickname New nickname
-     */
-    public void editNickname(final String nickname) {
-        model.editNickname((String) model.getSelectedNickname(), nickname);
-    }
-
-    /**
-     * Deletes the selected nickname.
-     */
-    public void deleteNickname() {
-        model.deleteNickname(model.getSelectedNickname());
-    }
-
-    /**
-     * Closes the dialog.
-     */
-    public void closeDialog() {
-        dialog.dispose();
-    }
-
-    /**
-     * Saves the model and closes the dialog.
-     */
-    public void saveAndCloseDialog() {
-        model.save();
-        closeDialog();
-    }
-
-}

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

@@ -1,159 +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.profiles;
-
-import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.actions.wrappers.Profile;
-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.config.IdentityController;
-import com.dmdirc.interfaces.config.IdentityFactory;
-import com.dmdirc.ui.IconManager;
-
-import java.awt.Window;
-
-import javax.inject.Inject;
-import javax.swing.Box;
-import javax.swing.JButton;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JScrollPane;
-import javax.swing.JTextField;
-import javax.swing.ListSelectionModel;
-
-import net.miginfocom.swing.MigLayout;
-
-/** Profile editing dialog. */
-public class ProfileManagerDialog extends StandardDialog {
-
-    /** Serial version UID. */
-    private static final long serialVersionUID = 3;
-    /** Model used to store state. */
-    private final ProfileManagerModel model;
-    /** Dialog controller, used to perform actions. */
-    private final ProfileManagerController controller;
-    /** Dialog linker. */
-    private final ProfileManagerDialogLinker linker;
-    /** List of profiles. */
-    private final JList<Profile> profileList = new JList<>();
-    /** Icon manager. */
-    private final IconManager iconManager;
-    /** 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;
-    /** Edits the realname for the active profile. */
-    private final JTextField realname;
-    /** Edits the ident for the active profile. */
-    private final JTextField ident;
-    /** 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 identityFactory    Identity factory to create new identities
-     * @param identityController Identity controller to retrieve identities from
-     * @param iconManager        Icon manager to retrieve icons
-     */
-    @Inject
-    public ProfileManagerDialog(
-            @MainWindow final Window mainFrame,
-            final IdentityFactory identityFactory,
-            final IdentityController identityController,
-            @GlobalConfig final IconManager iconManager) {
-        super(mainFrame, ModalityType.DOCUMENT_MODAL);
-        setTitle("Profile Manager");
-        this.model = new ProfileManagerModel(identityController, identityFactory);
-        this.controller = new ProfileManagerController(this, model, identityFactory);
-        this.iconManager = iconManager;
-        realname = new JTextField();
-        ident = new JTextField();
-        name = new JTextField();
-        linker = new ProfileManagerDialogLinker(controller, model, this, iconManager);
-        linker.bindAddNickname(addNickname);
-        linker.bindAddProfile(addProfile);
-        linker.bindCancelButton(getCancelButton());
-        linker.bindDeleteNickname(deleteNickname);
-        linker.bindDeleteProfile(deleteProfile);
-        linker.bindEditNickname(editNickname);
-        linker.bindProfileList(profileList);
-        linker.bindOKButton(getOkButton());
-        linker.bindProfileIdent(ident);
-        linker.bindProfileName(name);
-        linker.bindProfileNicknames(nicknames);
-        linker.bindProfileRealnames(realname);
-        initComponents();
-        model.load();
-    }
-
-    /** Initialises the components. */
-    private void initComponents() {
-        profileList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-        nicknames.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-        profileList.setCellRenderer(new PropertyListCellRenderer<>(profileList.getCellRenderer(),
-                Profile.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.getNameValidator(), 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");
-    }
-
-}

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

@@ -1,335 +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.profiles;
-
-import com.dmdirc.actions.wrappers.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.addons.ui_swing.dialogs.StandardQuestionDialog;
-import com.dmdirc.ui.IconManager;
-
-import java.awt.Dialog.ModalityType;
-import java.beans.PropertyVetoException;
-
-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;
-
-/**
- * Links the UI code with the model and controller.
- */
-public class ProfileManagerDialogLinker {
-
-    /** Dialog controller. */
-    private final ProfileManagerController controller;
-    /** Dialog model. */
-    private final ProfileManagerModel model;
-    /** Dialog. */
-    private final ProfileManagerDialog dialog;
-    /** The icon manager to use for validating text fields. */
-    private final IconManager iconManager;
-
-    public ProfileManagerDialogLinker(
-            final ProfileManagerController controller,
-            final ProfileManagerModel model,
-            final ProfileManagerDialog dialog,
-            final IconManager iconManager) {
-        this.controller = controller;
-        this.model = model;
-        this.dialog = dialog;
-        this.iconManager = iconManager;
-    }
-
-    /**
-     * Binds the profile list to the model.
-     *
-     * @param list List to bind
-     */
-    public void bindProfileList(final JList<Profile> list) {
-        list.setModel(new DefaultListModel<>());
-        final VetoableListSelectionModel listModel = new VetoableListSelectionModel();
-        list.setSelectionModel(listModel);
-        listModel.addVetoableSelectionListener(evt -> {
-            if (!model.isChangeProfileAllowed()) {
-                throw new PropertyVetoException("", evt);
-            }
-        });
-        listModel.addListSelectionListener(e -> model.setSelectedProfile(list.getSelectedValue()));
-        model.addPropertyChangeListener("profiles", evt -> {
-            ((DefaultListModel<Profile>) list.getModel()).clear();
-            for (Profile profile : model.getProfiles()) {
-                ((DefaultListModel<Profile>) list.getModel()).addElement(profile);
-            }
-            if (list.getSelectedValue() != model.getSelectedProfile()) {
-                list.setSelectedValue(model.getSelectedProfile(), true);
-            }
-        });
-        model.addPropertyChangeListener("name", evt -> list.repaint());
-        for (Profile profile : model.getProfiles()) {
-            ((DefaultListModel<Profile>) list.getModel()).addElement(profile);
-        }
-    }
-
-    /**
-     * Binds the nicknames list to the model.
-     *
-     * @param nicknames list to bind
-     */
-    public void bindProfileNicknames(final ReorderableJList<String> nicknames) {
-        nicknames.setModel(new DefaultListModel<>());
-        nicknames.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-        nicknames.getSelectionModel().addListSelectionListener(
-                e -> model.setSelectedNickname(nicknames.getSelectedValue()));
-        model.addPropertyChangeListener("selectedprofile", evt -> {
-            nicknames.getModel().clear();
-            for (String nickname : model.getNicknames()) {
-                nicknames.getModel().addElement(nickname);
-            }
-            nicknames.setSelectedValue(model.getSelectedNickname(), true);
-            nicknames.setEnabled(model.isManipulateProfileAllowed());
-        });
-        model.addPropertyChangeListener("profiles",
-                evt -> nicknames.setEnabled(model.isManipulateProfileAllowed()));
-        model.addPropertyChangeListener("nicknames", evt -> {
-            nicknames.getModel().clear();
-            for (String nickname : model.getNicknames()) {
-                nicknames.getModel().addElement(nickname);
-            }
-            nicknames.setSelectedValue(model.getSelectedNickname(), true);
-            nicknames.setEnabled(model.isManipulateProfileAllowed());
-        });
-        nicknames.setEnabled(model.isManipulateProfileAllowed());
-    }
-
-    /**
-     * Binds the add nickname button to the controller.
-     *
-     * @param addNickname Button to bind
-     */
-    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),
-                controller::addNickname).display());
-        model.addPropertyChangeListener("selectedprofile",
-                evt -> addNickname.setEnabled(model.isManipulateProfileAllowed()));
-        model.addPropertyChangeListener("profiles",
-                evt -> addNickname.setEnabled(model.isManipulateProfileAllowed()));
-        addNickname.setEnabled(model.isManipulateProfileAllowed());
-    }
-
-    /**
-     * Binds the edit nickname button to the controller.
-     *
-     * @param editNickname Button to bind
-     */
-    public void bindEditNickname(final JButton editNickname) {
-        editNickname.addActionListener(e -> {
-            final StandardInputDialog inputDialog = new StandardInputDialog(dialog,
-                    ModalityType.DOCUMENT_MODAL, iconManager,
-                    "Add nickname", "Enter edited nickname:",
-                    new EditNicknameValidator(model), controller::editNickname);
-            inputDialog.setText((String) model.getSelectedNickname());
-            inputDialog.display();
-        });
-        model.addPropertyChangeListener("selectednickname",
-                evt -> editNickname.setEnabled(model.isManipulateNicknameAllowed()));
-        model.addPropertyChangeListener("nicknames",
-                evt -> editNickname.setEnabled(model.isManipulateNicknameAllowed()));
-        editNickname.setEnabled(model.isManipulateNicknameAllowed());
-    }
-
-    /**
-     * Binds the delete nickname button to the controller.
-     *
-     * @param deleteNickname Button to bind
-     */
-    public void bindDeleteNickname(final JButton deleteNickname) {
-        deleteNickname.addActionListener(e -> new StandardQuestionDialog(dialog, ModalityType.DOCUMENT_MODAL,
-                "Delete nickname?", "Are you sure you want to delete this nickname?",
-                controller::deleteNickname).display());
-        model.addPropertyChangeListener("selectednickname",
-                evt -> deleteNickname.setEnabled(model.isManipulateNicknameAllowed()));
-        model.addPropertyChangeListener("nicknames",
-                evt -> deleteNickname.setEnabled(model.isManipulateNicknameAllowed()));
-        deleteNickname.setEnabled(model.isManipulateNicknameAllowed());
-    }
-
-    /**
-     * Binds the profile name to the model.
-     *
-     * @param profileName Text field to bind
-     */
-    public void bindProfileName(final JTextField profileName) {
-        profileName.getDocument().addDocumentListener(new DocumentListener() {
-            @Override
-            public void insertUpdate(final DocumentEvent e) {
-                model.setName(profileName.getText());
-                profileName.setEnabled(model.isManipulateProfileAllowed());
-            }
-
-            @Override
-            public void removeUpdate(final DocumentEvent e) {
-                model.setName(profileName.getText());
-                profileName.setEnabled(model.isManipulateProfileAllowed());
-            }
-
-            @Override
-            public void changedUpdate(final DocumentEvent e) {
-                if (!model.isNameValid().isFailure()) {
-                    model.setName(profileName.getText());
-                }
-                profileName.setEnabled(model.isManipulateProfileAllowed());
-            }
-        });
-        model.addPropertyChangeListener("selectedprofile", evt -> {
-            profileName.setText(model.getName());
-            profileName.setEnabled(model.isManipulateProfileAllowed());
-        });
-        model.addPropertyChangeListener("profiles", evt -> {
-            profileName.setText(model.getName());
-            profileName.setEnabled(model.isManipulateProfileAllowed());
-        });
-        profileName.setEnabled(model.isManipulateProfileAllowed());
-    }
-
-    /**
-     * Binds the profile realname to the model.
-     *
-     * @param profileRealname Textfield to bind
-     */
-    public void bindProfileRealnames(final JTextField profileRealname) {
-        profileRealname.getDocument().addDocumentListener(new DocumentListener() {
-            @Override
-            public void insertUpdate(final DocumentEvent e) {
-                model.setRealname(profileRealname.getText());
-                profileRealname.setEnabled(model.isManipulateProfileAllowed());
-            }
-
-            @Override
-            public void removeUpdate(final DocumentEvent e) {
-                model.setRealname(profileRealname.getText());
-                profileRealname.setEnabled(model.isManipulateProfileAllowed());
-            }
-
-            @Override
-            public void changedUpdate(final DocumentEvent e) {
-                model.setRealname(profileRealname.getText());
-                profileRealname.setEnabled(model.isManipulateProfileAllowed());
-            }
-        });
-        model.addPropertyChangeListener("selectedprofile", evt -> {
-            profileRealname.setText(model.getRealname());
-            profileRealname.setEnabled(model.isManipulateProfileAllowed());
-        });
-        profileRealname.setEnabled(model.isManipulateProfileAllowed());
-    }
-
-    /**
-     * Binds the profile ident to the model.
-     *
-     * @param profileIdent Textfield to bind
-     */
-    public void bindProfileIdent(final JTextField profileIdent) {
-        profileIdent.getDocument().addDocumentListener(new DocumentListener() {
-            @Override
-            public void insertUpdate(final DocumentEvent e) {
-                model.setIdent(profileIdent.getText());
-                profileIdent.setEnabled(model.isManipulateProfileAllowed());
-            }
-
-            @Override
-            public void removeUpdate(final DocumentEvent e) {
-                model.setIdent(profileIdent.getText());
-                profileIdent.setEnabled(model.isManipulateProfileAllowed());
-            }
-
-            @Override
-            public void changedUpdate(final DocumentEvent e) {
-                model.setIdent(profileIdent.getText());
-                profileIdent.setEnabled(model.isManipulateProfileAllowed());
-            }
-        });
-        model.addPropertyChangeListener("selectedprofile",
-                evt -> profileIdent.setEnabled(model.isManipulateProfileAllowed()));
-        model.addPropertyChangeListener("profiles",
-                evt -> profileIdent.setEnabled(model.isManipulateProfileAllowed()));
-        profileIdent.setEnabled(model.isManipulateProfileAllowed());
-    }
-
-    /**
-     * Binds the add profile button to the controller.
-     *
-     * @param addProfile Button to bind
-     */
-    public void bindAddProfile(final JButton addProfile) {
-        addProfile.addActionListener(e -> {
-            final StandardInputDialog inputDialog = new StandardInputDialog(dialog,
-                    ModalityType.DOCUMENT_MODAL, iconManager,
-                    "Add profile", "New profile name:",
-                    new ProfileNameValidator(model.getProfiles()), controller::addProfile);
-            inputDialog.setDocumentFilter(new ProfileNameDocumentFilter());
-            inputDialog.setText((String) model.getSelectedNickname());
-            inputDialog.display();
-        });
-    }
-
-    /**
-     * Binds the delete profile button to the controller.
-     *
-     * @param deleteProfile Button to bind
-     */
-    public void bindDeleteProfile(final JButton deleteProfile) {
-        deleteProfile.addActionListener(e -> new StandardQuestionDialog(dialog, ModalityType.DOCUMENT_MODAL,
-                "Delete profile?", "Are you sure you want to delete this profile?",
-                controller::deleteProfile).display());
-        model.addPropertyChangeListener("profiles",
-                evt -> deleteProfile.setEnabled(model.isManipulateProfileAllowed()));
-        deleteProfile.setEnabled(model.isManipulateProfileAllowed());
-    }
-
-    /**
-     * Binds the OK button to the controller.
-     *
-     * @param okButton Button to bind
-     */
-    public void bindOKButton(final JButton okButton) {
-        okButton.addActionListener(e -> controller.saveAndCloseDialog());
-        model.addPropertyChangeListener(evt -> okButton.setEnabled(model.isOKAllowed()));
-        okButton.setEnabled(model.isOKAllowed());
-    }
-
-    /**
-     * Binds the cancel button to the controller.
-     *
-     * @param cancelButton Button to bind
-     */
-    public void bindCancelButton(final JButton cancelButton) {
-        cancelButton.addActionListener(e -> controller.closeDialog());
-    }
-
-}

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

@@ -1,584 +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.profiles;
-
-import com.dmdirc.actions.wrappers.Profile;
-import com.dmdirc.interfaces.config.ConfigProvider;
-import com.dmdirc.interfaces.config.IdentityController;
-import com.dmdirc.interfaces.config.IdentityFactory;
-import com.dmdirc.util.validators.FileNameValidator;
-import com.dmdirc.util.validators.IdentValidator;
-import com.dmdirc.util.validators.ListNotEmptyValidator;
-import com.dmdirc.util.validators.NotEmptyValidator;
-import com.dmdirc.util.validators.ValidationResponse;
-import com.dmdirc.util.validators.Validator;
-import com.dmdirc.util.validators.ValidatorChain;
-
-import com.google.common.collect.ImmutableList;
-
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeListenerProxy;
-import java.beans.PropertyChangeSupport;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-
-/**
- * Model used to store state for the profile manager dialog.
- */
-public class ProfileManagerModel {
-
-    /** Profile change support. */
-    private final PropertyChangeSupport pcs;
-    /** Identity Controller. */
-    private final IdentityController identityController;
-    /** Identity Factory. */
-    private final IdentityFactory identityFactory;
-    /** List of known profiles. */
-    private List<Profile> profiles = new ArrayList<>();
-    /** List of profiles to be displayed. */
-    private final List<Profile> displayedProfiles = new ArrayList<>();
-    /** Selected profile. */
-    private Profile selectedProfile;
-    /** Selected nickname. */
-    private String selectedNickname;
-
-    /**
-     * Creates a new model.
-     *
-     * @param identityController Identity manager to retrieve profiles from.
-     * @param identityFactory    Factory to use when creating new profiles.
-     */
-    public ProfileManagerModel(
-            final IdentityController identityController,
-            final IdentityFactory identityFactory) {
-        pcs = new PropertyChangeSupport(this);
-        this.identityController = identityController;
-        this.identityFactory = identityFactory;
-    }
-
-    /**
-     * Load model with data.
-     */
-    public void load() {
-        final List<ConfigProvider> identities = identityController.getProvidersByType("profile");
-        profiles.addAll(identities.stream().map(identity -> new Profile(identityFactory, identity))
-                .collect(Collectors.toList()));
-        updateDisplayedProfiles();
-        if (!profiles.isEmpty()) {
-            selectedProfile = profiles.get(0);
-        }
-        final PropertyChangeListener[] listeners = pcs.getPropertyChangeListeners();
-        for (PropertyChangeListener listener : listeners) {
-            if (listener instanceof PropertyChangeListenerProxy) {
-                final PropertyChangeListenerProxy proxy = (PropertyChangeListenerProxy) listener;
-                pcs.firePropertyChange(proxy.getPropertyName(), null, null);
-            }
-        }
-    }
-
-    /**
-     * Updates the list of displayed profiles, showing only those not marked deleted.
-     */
-    private void updateDisplayedProfiles() {
-        displayedProfiles.clear();
-        displayedProfiles.addAll(profiles.stream()
-                .filter(profile -> !profile.isDeleted())
-                .collect(Collectors.toList()));
-    }
-
-    /**
-     * Gets the list of displayable profiles.
-     *
-     * @return List of profiles to display
-     */
-    public List<Profile> getProfiles() {
-        return ImmutableList.copyOf(displayedProfiles);
-    }
-
-    /**
-     * Sets the list of profiles.
-     *
-     * @param profiles List of profiles to display
-     */
-    public void setProfiles(final List<Profile> profiles) {
-        this.profiles = new ArrayList<>(profiles);
-        updateDisplayedProfiles();
-        if (!profiles.contains(selectedProfile)) {
-            upadateSelectedProfile(null);
-        }
-        if (selectedProfile == null && !profiles.isEmpty()) {
-            upadateSelectedProfile(profiles.get(0));
-        }
-        pcs.firePropertyChange("profiles", null, null);
-    }
-
-    /**
-     * Adds the specified profile to the list.
-     *
-     * @param profile New profile
-     */
-    public void addProfile(final Profile profile) {
-        profiles.add(profile);
-        updateDisplayedProfiles();
-        upadateSelectedProfile(profile);
-        pcs.firePropertyChange("profiles", null, null);
-    }
-
-    /**
-     * Marks the selected profile as deleted.
-     *
-     * @param profile Profile to delete
-     */
-    public void deleteProfile(final Profile profile) {
-        if (profile == null) {
-            return;
-        }
-        profile.setDeleted(true);
-        final int selected = displayedProfiles.indexOf(selectedProfile);
-        displayedProfiles.remove(profile);
-        final int size = displayedProfiles.size();
-        Profile newSelectedProfile = null;
-        if (profile != selectedProfile) {
-            newSelectedProfile = selectedProfile;
-        } else if (selected >= size && size > 0) {
-            newSelectedProfile = displayedProfiles.get(size - 1);
-        } else if (selected <= 0 && size > 0) {
-            newSelectedProfile = displayedProfiles.get(0);
-        } else if (selected - 1 >= 0 && size != 0) {
-            newSelectedProfile = displayedProfiles.get(selected - 1);
-        }
-        upadateSelectedProfile(newSelectedProfile);
-        pcs.firePropertyChange("profiles", null, null);
-    }
-
-    /**
-     * Updates the selected profile. This method clears the selected nickname, the update method is
-     * not called by this method.
-     *
-     * @param profile Newly selected profile, may be null
-     */
-    private void upadateSelectedProfile(final Profile profile) {
-        selectedProfile = profile;
-        selectedNickname = null;
-    }
-
-    /**
-     * Sets the selected profile.
-     *
-     * @param selectedProfile Profile to select, null ignored
-     */
-    public void setSelectedProfile(final Object selectedProfile) {
-        if (selectedProfile != null
-                && !profiles.isEmpty()
-                && profiles.contains(selectedProfile)) {
-            upadateSelectedProfile((Profile) selectedProfile);
-        }
-        pcs.firePropertyChange("selectedprofile", null, null);
-    }
-
-    /**
-     * Retrieves the selected profile.
-     *
-     * @return Selected profile (String)
-     */
-    public Object getSelectedProfile() {
-        return selectedProfile;
-    }
-
-    /**
-     * Retrieves the list of nicknames for the active profile, this will return an empty list if
-     * there is no selected profile.
-     *
-     * @return List of nicknames
-     */
-    public List<String> getNicknames() {
-        if (selectedProfile == null) {
-            return Collections.emptyList();
-        }
-        return selectedProfile.getNicknames();
-    }
-
-    /**
-     * Sets the list of nicknames for the active profile. Will do nothing if there is no active
-     * profile.
-     *
-     * @param nicknames List of nicknames
-     */
-    public void setNicknames(final List<String> nicknames) {
-        if (selectedProfile == null) {
-            return;
-        }
-        selectedProfile.setNicknames(nicknames);
-        pcs.firePropertyChange("nicknames", null, null);
-    }
-
-    /**
-     * Adds the specified nickname to the list of nicknames in the active profile. Will do nothing
-     * if there is no active profile.
-     *
-     * @param nickname New nickname
-     */
-    public void addNickname(final String nickname) {
-        if (selectedProfile == null) {
-            return;
-        }
-        selectedProfile.addNickname(nickname);
-        selectedNickname = nickname;
-        pcs.firePropertyChange("nicknames", null, null);
-    }
-
-    /**
-     * Deletes the specified nickname from the active profile. This method will do nothing if there
-     * is no active profile.
-     *
-     * @param nickname Nickname to be deleted (This method will do nothing if this is not a String)
-     */
-    public void deleteNickname(final Object nickname) {
-        if (nickname instanceof String) {
-            deleteNickname((String) nickname);
-        }
-    }
-
-    /**
-     * Deletes the specified nickname from the active profile. This method will do nothing if there
-     * is no active profile.
-     *
-     * @param nickname Nickname to be deleted
-     */
-    public void deleteNickname(final String nickname) {
-        if (selectedProfile == null || nickname == null) {
-            return;
-        }
-        final int selected = selectedProfile.getNicknames().indexOf(nickname);
-        selectedProfile.delNickname(nickname);
-        final int size = selectedProfile.getNicknames().size();
-        String newSelectedNickname = null;
-        if (!nickname.equals(selectedNickname)) {
-            newSelectedNickname = selectedNickname;
-        } else if (selected >= size && size > 0) {
-            newSelectedNickname = selectedProfile.getNicknames().get(size - 1);
-        } else if (selected <= 0 && size > 0) {
-            newSelectedNickname = selectedProfile.getNicknames().get(0);
-        } else if (selected - 1 >= 0 && size != 0) {
-            newSelectedNickname = selectedProfile.getNicknames().get(selected - 1);
-        }
-        selectedNickname = newSelectedNickname;
-        pcs.firePropertyChange("nicknames", null, null);
-    }
-
-    /**
-     * Alters the specified nickname.
-     *
-     * @param nickname Nickname to be edited
-     * @param edited   Resultant nickname
-     */
-    public void editNickname(final String nickname, final String edited) {
-        selectedNickname = edited;
-        selectedProfile.editNickname(nickname, edited);
-        selectedNickname = edited;
-        pcs.firePropertyChange("nicknames", null, null);
-    }
-
-    /**
-     * Sets the selected nickname on the active profile. This method expects a String, it will do
-     * nothing if the parameter is not. If the specified nickname is not found the selection will be
-     * cleared.
-     *
-     * @param selectedNickname Nickname to be selected, may be null. (This method will do nothing if
-     *                         this is not a String)
-     */
-    public void setSelectedNickname(final Object selectedNickname) {
-        if (selectedProfile != null
-                && selectedNickname instanceof String
-                && selectedProfile.getNicknames().contains(selectedNickname)) {
-            this.selectedNickname = (String) selectedNickname;
-            pcs.firePropertyChange("selectednickname", null, null);
-        }
-    }
-
-    /**
-     * Retrieves the selected nickname from the active profile.
-     *
-     * @return Selected nickname (String) or an empty string if there is no active profile
-     */
-    public Object getSelectedNickname() {
-        if (selectedProfile == null) {
-            return "";
-        }
-        return selectedNickname;
-    }
-
-    /**
-     * Retrieves the name of the active profile.
-     *
-     * @return Active profile name or an empty string if there is no active profile
-     */
-    public String getName() {
-        if (selectedProfile == null) {
-            return "";
-        }
-        return selectedProfile.getName();
-    }
-
-    /**
-     * Sets the name of the active profile. This method will do nothing if there is no active
-     * profile.
-     *
-     * @param name New profile name
-     */
-    public void setName(final String name) {
-        if (selectedProfile != null) {
-            selectedProfile.setName(name);
-            pcs.firePropertyChange("name", null, null);
-        }
-    }
-
-    /**
-     * Retrieves the realname in the active profile.
-     *
-     * @return Active profile realname or an empty string if there is no active profile
-     */
-    public String getRealname() {
-        if (selectedProfile == null) {
-            return "";
-        }
-        return selectedProfile.getRealname();
-    }
-
-    /**
-     * Sets the realname in the active profile. This method will do nothing if there is no active
-     * profile.
-     *
-     * @param realname New profile real name
-     */
-    public void setRealname(final String realname) {
-        if (selectedProfile != null) {
-            selectedProfile.setRealname(realname);
-            pcs.firePropertyChange("realname", null, null);
-        }
-    }
-
-    /**
-     * Retrieves the ident of the active profile. This method will return an empty string if there
-     * is no active profile.
-     *
-     * @return Active profile ident or an empty string if there is no active profile
-     */
-    public String getIdent() {
-        if (selectedProfile == null) {
-            return "";
-        }
-        return selectedProfile.getIdent();
-    }
-
-    /**
-     * Sets the ident of the active profile. This method will do nothing if there is no active
-     * profile.
-     *
-     * @param ident New profile ident
-     */
-    public void setIdent(final String ident) {
-        if (selectedProfile != null) {
-            selectedProfile.setIdent(ident);
-            pcs.firePropertyChange("ident", null, null);
-        }
-    }
-
-    /**
-     * Checks whether is it possible to manipulate a profile.
-     *
-     * @return true when a profile is selected
-     */
-    public boolean isManipulateProfileAllowed() {
-        return getSelectedProfile() != null;
-    }
-
-    /**
-     * Checks whether is it possible to manipulate a nickname.
-     *
-     * @return true when a nickname is selected
-     */
-    public boolean isManipulateNicknameAllowed() {
-        return getSelectedProfile() != null && getSelectedNickname() != null;
-    }
-
-    /**
-     * Is it possible to change profile?
-     *
-     * @return true if all validators for the selected profile pass
-     */
-    public boolean isChangeProfileAllowed() {
-        return !isNameValid().isFailure()
-                && !isNicknamesValid().isFailure()
-                && !isIdentValid().isFailure()
-                && !isRealnameValid().isFailure();
-    }
-
-    /**
-     * Is it possible to save and close the dialog?
-     *
-     * @return true if all other validators pass and there is at least one profile
-     */
-    public boolean isOKAllowed() {
-        return !profiles.isEmpty()
-                && !isNameValid().isFailure()
-                && !isNicknamesValid().isFailure()
-                && !isIdentValid().isFailure()
-                && !isRealnameValid().isFailure();
-    }
-
-    /**
-     * Retrieves the profile name validator.
-     *
-     * @return Passes if the name is a non empty non duplicate filename
-     */
-    public Validator<String> getNameValidator() {
-        return ValidatorChain.<String>builder()
-                .addValidator(new FileNameValidator())
-                .addValidator(new ProfileRenameValidator(this))
-                .build();
-    }
-
-    /**
-     * Is the profile name valid? If there is no active profile the validation passes.
-     *
-     * @return Passes if the name is a non empty non duplicate filename
-     */
-    public ValidationResponse isNameValid() {
-        if (selectedProfile == null) {
-            return new ValidationResponse();
-        }
-        return getNameValidator().validate(selectedProfile.getName());
-    }
-
-    /**
-     * Are the nicknames in the active profile valid? If there is no active profile the validation
-     * passes.
-     *
-     * @return passes when there are nicknames present
-     */
-    public ValidationResponse isNicknamesValid() {
-        if (selectedProfile == null) {
-            return new ValidationResponse();
-        }
-        return getNicknamesValidator().validate(selectedProfile.getNicknames());
-    }
-
-    /**
-     * Retrieves the nicknames validator.
-     *
-     * @return Passes if the nicknames list is non empty
-     */
-    public Validator<List<String>> getNicknamesValidator() {
-        return new ListNotEmptyValidator<>();
-    }
-
-    /**
-     * Retrieves the realname validator.
-     *
-     * @return Passes if the realname is a non empty string
-     */
-    public Validator<String> getRealnameValidator() {
-        return new NotEmptyValidator();
-    }
-
-    /**
-     * Is the realname in the active profile valid? If there is no active profile the validation
-     * passes.
-     *
-     * @return passes the realname is valid
-     */
-    public ValidationResponse isRealnameValid() {
-        if (selectedProfile == null) {
-            return new ValidationResponse();
-        }
-        return getRealnameValidator().validate(selectedProfile.getRealname());
-    }
-
-    /**
-     * Retrieves the ident validator.
-     *
-     * @return Passes if the ident is an empty string and a valid ident
-     */
-    public Validator<String> getIdentValidator() {
-        return ValidatorChain.<String>builder()
-                .addValidator(new IdentValidator())
-                .build();
-    }
-
-    /**
-     * Is the ident in the active profile valid? If there is no active profile the validation
-     * passes.
-     *
-     * @return passes the ident is valid
-     */
-    public ValidationResponse isIdentValid() {
-        if (selectedProfile == null) {
-            return new ValidationResponse();
-        }
-        return getIdentValidator().validate(selectedProfile.getIdent());
-    }
-
-    /**
-     * This method saves any changes made in the model to disk. All profiles marked for deletion are
-     * removed and then all remaining profiles are have their save method called.
-     */
-    public void save() {
-        for (Profile profile : profiles) {
-            if (profile.isDeleted()) {
-                try {
-                    profile.delete();
-                } catch (IOException ex) {
-                    // TODO: handle somehow
-                }
-            } else {
-                profile.save();
-            }
-        }
-    }
-
-    /**
-     * Adds a property change listener to all property change events in the model.
-     *
-     * @param listener Listener to add
-     */
-    public void addPropertyChangeListener(final PropertyChangeListener listener) {
-        pcs.addPropertyChangeListener(listener);
-    }
-
-    /**
-     * Adds a property change listener to a given property on this model.
-     *
-     * @param propertyName Property to listen on
-     * @param listener     Listener to add
-     */
-    public void addPropertyChangeListener(final String propertyName,
-            final PropertyChangeListener listener) {
-        pcs.addPropertyChangeListener(propertyName, listener);
-    }
-
-}

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/profiles/ProfileNameDocumentFilter.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.profiles;
-
-import javax.swing.text.AttributeSet;
-import javax.swing.text.BadLocationException;
-import javax.swing.text.DocumentFilter;
-
-/**
- * Filters whitespace from a document.
- */
-public class ProfileNameDocumentFilter extends DocumentFilter {
-
-    /** Invalid filename characters. */
-    private static final String INVALID_CHARS = "[^A-Za-z0-9\\-_!]";
-
-    @Override
-    public void insertString(final DocumentFilter.FilterBypass fb,
-            final int offset, final String string, final AttributeSet attr)
-            throws BadLocationException {
-
-        if (string != null && !string.isEmpty()) {
-            replace(fb, offset, string.length(), string, attr);
-        }
-    }
-
-    @Override
-    public void remove(final DocumentFilter.FilterBypass fb, final int offset,
-            final int length) throws BadLocationException {
-
-        replace(fb, offset, length, "", null);
-    }
-
-    @Override
-    public void replace(final DocumentFilter.FilterBypass fb, final int offset,
-            final int length, final String text, final AttributeSet attrs)
-            throws BadLocationException {
-
-        fb.replace(offset, length, sanitise(text), attrs);
-    }
-
-    /**
-     * Sanitises the proposed value.
-     *
-     * @param proposedValue String to sanitise
-     *
-     * @return Sanitised string
-     */
-    private String sanitise(final String proposedValue) {
-        return proposedValue.replaceAll(INVALID_CHARS, "");
-    }
-
-}

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

@@ -1,57 +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.profiles;
-
-import com.dmdirc.actions.wrappers.Profile;
-import com.dmdirc.util.validators.FileNameValidator;
-import com.dmdirc.util.validators.ValidationResponse;
-import com.dmdirc.util.validators.Validator;
-import com.dmdirc.util.validators.ValidatorChain;
-
-import java.util.List;
-
-/**
- * Validator to ensure a profile name is both unique and a valid name to be saved to disk.
- */
-public class ProfileNameValidator implements Validator<String> {
-
-    private final ValidatorChain<String> validator;
-
-    /**
-     * Creates a new profile name validator.
-     *
-     * @param profiles List of profiles to check uniqueness
-     */
-    public ProfileNameValidator(final List<Profile> profiles) {
-        validator = ValidatorChain.<String>builder()
-                .addValidator(new UniqueProfileNameValidator(profiles))
-                .addValidator(new FileNameValidator())
-                .build();
-    }
-
-    @Override
-    public ValidationResponse validate(final String object) {
-        return validator.validate(object == null ? "" : object.trim());
-    }
-
-}

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

@@ -1,52 +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.profiles;
-
-import com.dmdirc.actions.wrappers.Profile;
-import com.dmdirc.util.validators.ValidationResponse;
-import com.dmdirc.util.validators.Validator;
-
-/**
- * Ensures profile names are unique.
- */
-public class ProfileRenameValidator implements Validator<String> {
-
-    /** Profile model. */
-    private final ProfileManagerModel model;
-
-    public ProfileRenameValidator(final ProfileManagerModel model) {
-        this.model = model;
-    }
-
-    @Override
-    public ValidationResponse validate(final String object) {
-        for (Profile targetprofile : model.getProfiles()) {
-            if (targetprofile != model.getSelectedProfile()
-                    && targetprofile.getName().equalsIgnoreCase(object)) {
-                return new ValidationResponse("Profile names must be unique");
-            }
-        }
-        return new ValidationResponse();
-    }
-
-}

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

@@ -1,53 +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.profiles;
-
-import com.dmdirc.actions.wrappers.Profile;
-import com.dmdirc.util.validators.ValidationResponse;
-import com.dmdirc.util.validators.Validator;
-
-import java.util.List;
-
-/**
- * Validates a profile name ensuring its uniqueness and validity as a filename.
- */
-public class UniqueProfileNameValidator implements Validator<String> {
-
-    /** List of profiles to validate. */
-    private final List<Profile> profiles;
-
-    public UniqueProfileNameValidator(final List<Profile> profiles) {
-        this.profiles = profiles;
-    }
-
-    @Override
-    public ValidationResponse validate(final String object) {
-        for (Profile targetprofile : profiles) {
-            if (targetprofile.getName().equalsIgnoreCase(object)) {
-                return new ValidationResponse("Profile names must be unique");
-            }
-        }
-        return new ValidationResponse();
-    }
-
-}

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

@@ -117,13 +117,6 @@ public class DialogModule {
         return new DialogProvider<>(provider);
     }
 
-    @Provides
-    @Singleton
-    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(

ui_swing/src/com/dmdirc/addons/ui_swing/wizard/firstrun/SwingFirstRunWizard.java

@@ -25,7 +25,7 @@ package com.dmdirc.addons.ui_swing.wizard.firstrun;
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.ClientModule.UserConfig;
 import com.dmdirc.DMDircMBassador;
-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 com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.addons.ui_swing.wizard.WizardDialog;

ui_swing/test/com/dmdirc/addons/ui_swing/dialogs/profiles/AddNicknameValidatorTest.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.profiles;
-
-import java.util.Arrays;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
-
-/**
- * Tests the nickname validator.
- */
-public class AddNicknameValidatorTest {
-
-    /**
-     * Test of validate method, of class AddNicknameValidator.
-     */
-    @Test
-    public void testValidateValid() {
-        final ProfileManagerModel model = mock(ProfileManagerModel.class);
-        when(model.getNicknames()).thenReturn(Arrays.asList(
-                new String[]{"nickname1", "nickname2",}));
-        final AddNicknameValidator instance = new AddNicknameValidator(model);
-        assertTrue(instance.validate("nickname1").isFailure());
-    }
-
-    /**
-     * Test of validate method, of class AddNicknameValidator.
-     */
-    @Test
-    public void testValidateInvalid() {
-        final ProfileManagerModel model = mock(ProfileManagerModel.class);
-        when(model.getNicknames()).thenReturn(Arrays.asList(
-                new String[]{"nickname1", "nickname2",}));
-        final AddNicknameValidator instance = new AddNicknameValidator(model);
-        assertFalse(instance.validate("nickname").isFailure());
-    }
-}

ui_swing/test/com/dmdirc/addons/ui_swing/dialogs/profiles/EditNicknameValidatorTest.java

@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2006-2014 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package com.dmdirc.addons.ui_swing.dialogs.profiles;
-
-import java.util.Arrays;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
-
-/**
- * Tests the edit nickname validator.
- */
-public class EditNicknameValidatorTest {
-
-    /**
-     * Test of validate method, of class EditNicknameValidatorTest.
-     */
-    @Test
-    public void testValidateNull() {
-        final ProfileManagerModel model = mock(ProfileManagerModel.class);
-        when(model.getSelectedNickname()).thenReturn(null);
-        when(model.getNicknames()).thenReturn(Arrays.asList(
-                new String[]{"nickname1", "nickname2",}));
-        final EditNicknameValidator instance = new EditNicknameValidator(model);
-        assertFalse(instance.validate("nickname").isFailure());
-    }
-
-    /**
-     * Test of validate method, of class EditNicknameValidatorTest.
-     */
-    @Test
-    public void testValidateEquals() {
-        final ProfileManagerModel model = mock(ProfileManagerModel.class);
-        when(model.getSelectedNickname()).thenReturn("nickname");
-        when(model.getNicknames()).thenReturn(Arrays.asList(
-                new String[]{"nickname1", "nickname2",}));
-        final EditNicknameValidator instance = new EditNicknameValidator(model);
-        assertFalse(instance.validate("nickname").isFailure());
-    }
-
-    /**
-     * Test of validate method, of class EditNicknameValidatorTest.
-     */
-    @Test
-    public void testValidateInvalid() {
-        final ProfileManagerModel model = mock(ProfileManagerModel.class);
-        when(model.getSelectedNickname()).thenReturn("nickname");
-        when(model.getNicknames()).thenReturn(Arrays.asList(
-                new String[]{"nickname1", "nickname2",}));
-        final EditNicknameValidator instance = new EditNicknameValidator(model);
-        assertFalse(instance.validate("nickname3").isFailure());
-    }
-}

ui_swing/test/com/dmdirc/addons/ui_swing/dialogs/profiles/ProfileManagerControllerTest.java

@@ -1,121 +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.profiles;
-
-import com.dmdirc.actions.wrappers.Profile;
-import com.dmdirc.interfaces.config.IdentityFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-/**
- * Tests for ProfileManagerController.
- */
-@RunWith(MockitoJUnitRunner.class)
-public class ProfileManagerControllerTest {
-
-    @Mock private ProfileManagerDialog dialog;
-    @Mock private ProfileManagerModel model;
-    @Mock private IdentityFactory identityFactory;
-
-    private ProfileManagerController instance;
-
-    @Before
-    public void setup() {
-        instance = new ProfileManagerController(dialog, model, identityFactory);
-    }
-
-    /**
-     * Test of addProfile method, of class ProfileManagerController.
-     */
-    @Test
-    public void testAddProfile() {
-        instance.addProfile("New Profile");
-        verify(model).addProfile(new Profile("New Profile", identityFactory));
-    }
-
-    /**
-     * Test of deleteProfile method, of class ProfileManagerController.
-     */
-    @Test
-    public void testDeleteProfile() {
-        final Profile selectedProfile = mock(Profile.class);
-        when(model.getSelectedProfile()).thenReturn(selectedProfile);
-        instance.deleteProfile();
-        verify(model).deleteProfile(selectedProfile);
-    }
-
-    /**
-     * Test of addNickname method, of class ProfileManagerController.
-     */
-    @Test
-    public void testAddNickname() {
-        instance.addNickname("test");
-        verify(model).addNickname("test");
-    }
-
-    /**
-     * Test of editNickname method, of class ProfileManagerController.
-     */
-    @Test
-    public void testEditNickname() {
-        when(model.getSelectedNickname()).thenReturn("test");
-        instance.editNickname("test2");
-        verify(model).editNickname("test", "test2");
-    }
-
-    /**
-     * Test of deleteNickname method, of class ProfileManagerController.
-     */
-    @Test
-    public void testDeleteNickname() {
-        when(model.getSelectedNickname()).thenReturn("test");
-        instance.deleteNickname();
-        verify(model).deleteNickname((Object) "test");
-    }
-
-    /**
-     * Test of closeDialog method, of class ProfileManagerController.
-     */
-    @Test
-    public void testCloseDialog() {
-        instance.closeDialog();
-        verify(dialog).dispose();
-    }
-
-    /**
-     * Test of saveAndCloseDialog method, of class ProfileManagerController.
-     */
-    @Test
-    public void testSaveAndCloseDialog() {
-        instance.saveAndCloseDialog();
-        verify(model).save();
-        verify(dialog).dispose();
-    }
-}

ui_swing/test/com/dmdirc/addons/ui_swing/dialogs/profiles/ProfileManagerModelTest.java

@@ -1,778 +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.profiles;
-
-import com.dmdirc.actions.wrappers.Profile;
-import com.dmdirc.interfaces.config.ConfigProvider;
-import com.dmdirc.interfaces.config.IdentityController;
-import com.dmdirc.interfaces.config.IdentityFactory;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-/**
- * Test for ProfileManagerModel
- */
-@RunWith(MockitoJUnitRunner.class)
-public class ProfileManagerModelTest {
-
-    @Mock private IdentityController manager;
-    @Mock private IdentityFactory identityFactory;
-
-    private Profile defaultProfile;
-
-    private Profile createProfile(final String prefix) {
-        final List<String> nicknames = new ArrayList<>();
-        nicknames.add(prefix + "nickname");
-
-        final ConfigProvider configProvider = mock(ConfigProvider.class);
-        when(configProvider.getName()).thenReturn(prefix + "profile");
-        when(configProvider.getOption("identity", "name")).thenReturn(prefix + "profile");
-        when(configProvider.getOptionList("profile", "nicknames")).thenReturn(nicknames);
-        when(configProvider.getOption("profile", "realname")).thenReturn(prefix + "realname");
-        when(configProvider.getOption("profile", "ident")).thenReturn(prefix + "ident");
-
-        return new Profile(identityFactory, configProvider);
-    }
-
-    private ProfileManagerModel createModel() {
-        defaultProfile = createProfile("1");
-        final ProfileManagerModel model = new ProfileManagerModel(manager, identityFactory);
-        model.addProfile(defaultProfile);
-        return model;
-    }
-
-    @Before
-    public void setup() {
-        final List<ConfigProvider> identities = Collections.emptyList();
-        manager = mock(IdentityController.class);
-        when(manager.getProvidersByType("profile")).thenReturn(identities);
-    }
-
-    /**
-     * Test creating profiles from identities.
-     */
-    @Test
-    public void testLoad() {
-        final List<String> nicknames = new ArrayList<>();
-        nicknames.add("nickname");
-        final ConfigProvider configProvider = mock(ConfigProvider.class);
-        when(configProvider.getName()).thenReturn("profile");
-        when(configProvider.getOption("identity", "name")).thenReturn("profile");
-        when(configProvider.getOptionList("profile", "nicknames")).thenReturn(nicknames);
-        when(configProvider.getOption("profile", "realname")).thenReturn("realname");
-        when(configProvider.getOption("profile", "ident")).thenReturn("ident");
-        final List<ConfigProvider> identities = new ArrayList<>();
-        identities.add(configProvider);
-        final IdentityController im = mock(IdentityController.class);
-        when(im.getProvidersByType("profile")).thenReturn(identities);
-
-        final ProfileManagerModel instance = new ProfileManagerModel(im, identityFactory);
-        instance.load();
-
-        assertEquals(Arrays.asList(new Profile[]{new Profile(identityFactory, configProvider), }), instance.getProfiles());
-    }
-
-    /**
-     * Test of setProfiles method, of class ProfileManagerModel.
-     */
-    @Test
-    public void testGetAndSetProfiles() {
-        final List<Profile> newProfiles = Arrays.asList(
-                new Profile[]{createProfile("2"),});
-        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
-        assertEquals(Collections.emptyList(), instance.getProfiles());
-        instance.setProfiles(newProfiles);
-        assertEquals(newProfiles, instance.getProfiles());
-    }
-
-    /**
-     * Test of addProfiles method, of class ProfileManagerModel.
-     */
-    @Test
-    public void testAddProfiles() {
-        final Profile newProfile = createProfile("2");
-        final ProfileManagerModel instance = createModel();
-        assertEquals(Arrays.asList(new Profile[]{defaultProfile,}), instance.getProfiles());
-        final List<Profile> newProfiles = new ArrayList<>();
-        newProfiles.add(defaultProfile);
-        newProfiles.add(newProfile);
-        instance.addProfile(newProfile);
-        assertEquals(newProfiles, instance.getProfiles());
-    }
-
-    /**
-     * Test deleting a null profile.
-     */
-    @Test
-    public void testDeleteProfileNullProfile() {
-        final Profile first = createProfile("1");
-        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
-        instance.addProfile(first);
-        instance.setSelectedProfile(first);
-        assertEquals(first, instance.getSelectedProfile());
-        instance.deleteProfile(null);
-        assertEquals(first, instance.getSelectedProfile());
-    }
-
-    /**
-     * Test selected profile behaviour upon deleting profiles.
-     */
-    @Test
-    public void testDeleteProfileNotSelected() {
-        final Profile first = createProfile("1");
-        final Profile second = createProfile("2");
-        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
-        instance.addProfile(first);
-        instance.addProfile(second);
-        instance.setSelectedProfile(second);
-        assertEquals(second, instance.getSelectedProfile());
-        instance.deleteProfile(first);
-        assertEquals(second, instance.getSelectedProfile());
-    }
-
-    /**
-     * Test selected profile behaviour upon deleting profiles.
-     */
-    @Test
-    public void testDeleteProfileLastProfile() {
-        final Profile first = createProfile("1");
-        final Profile second = createProfile("2");
-        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
-        instance.addProfile(first);
-        instance.addProfile(second);
-        instance.setSelectedProfile(second);
-        assertEquals(second, instance.getSelectedProfile());
-        instance.deleteProfile(second);
-        assertEquals(first, instance.getSelectedProfile());
-    }
-
-    /**
-     * Test selected profile behaviour upon deleting profiles.
-     */
-    @Test
-    public void testDeleteProfileFirstProfile() {
-        final Profile first = createProfile("1");
-        final Profile second = createProfile("2");
-        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
-        instance.addProfile(first);
-        instance.addProfile(second);
-        instance.setSelectedProfile(first);
-        assertEquals(first, instance.getSelectedProfile());
-        instance.deleteProfile(first);
-        assertEquals(second, instance.getSelectedProfile());
-    }
-
-    /**
-     * Test selected profile behaviour upon deleting profiles.
-     */
-    @Test
-    public void testDeleteProfileMiddleProfile() {
-        final Profile first = createProfile("1");
-        final Profile second = createProfile("2");
-        final Profile third = createProfile("3");
-        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
-        instance.addProfile(first);
-        instance.addProfile(second);
-        instance.addProfile(third);
-        instance.setSelectedProfile(second);
-        assertEquals(second, instance.getSelectedProfile());
-        instance.deleteProfile(second);
-        assertEquals(first, instance.getSelectedProfile());
-    }
-
-    /**
-     * Test deleting a null profile.
-     */
-    @Test
-    public void testDeleteProfileOnlyProfile() {
-        final Profile first = createProfile("1");
-        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
-        instance.addProfile(first);
-        instance.setSelectedProfile(first);
-        assertEquals(first, instance.getSelectedProfile());
-        instance.deleteProfile(first);
-        assertNull(instance.getSelectedProfile());
-    }
-
-    /**
-     * Test of setSelectedProfile method, of class ProfileManagerModel.
-     */
-    @Test
-    public void testGetAndSetSelectedProfile() {
-        final Profile profile2 = createProfile("2");
-        final Profile profile3 = createProfile("3");
-        final Profile profile4 = createProfile("4");
-        final ProfileManagerModel instance = createModel();
-        assertEquals(defaultProfile, instance.getSelectedProfile());
-        instance.addProfile(profile2);
-        assertEquals(profile2, instance.getSelectedProfile());
-        instance.addProfile(profile3);
-        instance.setSelectedProfile(profile2);
-        assertEquals(profile2, instance.getSelectedProfile());
-        instance.setSelectedProfile(profile4);
-        assertNotSame(profile4, instance.getSelectedProfile());
-    }
-
-    /**
-     * Test of getNicknames method, of class ProfileManagerModel.
-     */
-    @Test
-    public void testGetAndSetNicknames() {
-        final ProfileManagerModel instance = createModel();
-        final List<String> expResult = defaultProfile.getNicknames();
-        List<String> result = instance.getNicknames();
-        assertEquals(expResult, result);
-        result = Arrays.asList(new String[]{"foo", "bar",});
-        instance.setNicknames(result);
-        assertEquals(result, instance.getNicknames());
-    }
-
-    /**
-     * Test of addNickname method, of class ProfileManagerModel.
-     */
-    @Test
-    public void testAddNickname() {
-        final String nickname = "foo";
-        final ProfileManagerModel instance = createModel();
-        assertEquals(defaultProfile.getNicknames(), instance.getNicknames());
-        final List<String> nicknames = new ArrayList<>(defaultProfile.getNicknames());
-        instance.addNickname(nickname);
-        nicknames.add(nickname);
-        assertEquals(nicknames, instance.getNicknames());
-    }
-
-    /**
-     * Test of deleteNickname method, of class ProfileManagerModel.
-     */
-    @Test
-    public void testDeleteNicknameObject() {
-        final ProfileManagerModel instance = createModel();
-        final List<String> nicknames = new ArrayList<>(instance.getNicknames());
-        Object nickname = (Object) "";
-        assertEquals(nicknames, instance.getNicknames());
-        instance.deleteNickname(nickname);
-        assertEquals(nicknames, instance.getNicknames());
-        nickname = new Object();
-        assertEquals(nicknames, instance.getNicknames());
-        instance.deleteNickname(nickname);
-        assertEquals(nicknames, instance.getNicknames());
-    }
-
-    /**
-     * Test selected nickname behaviour upon deleting nickname.
-     */
-    @Test
-    public void testDeleteNicknameNullSelectedProfile() {
-        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
-        assertNull(instance.getSelectedProfile());
-        assertTrue(instance.getNicknames().isEmpty());
-        instance.deleteNickname("1nickname");
-    }
-
-    /**
-     * Test selected nickname behaviour upon deleting nickname.
-     */
-    @Test
-    public void testDeleteNicknameNullNickname() {
-        final Profile profile = createProfile("1");
-        final String first = "1nickname";
-        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
-        instance.addProfile(profile);
-        instance.setSelectedProfile(profile);
-        instance.setSelectedNickname(first);
-        assertEquals(first, instance.getSelectedNickname());
-        instance.deleteNickname(null);
-        assertEquals(first, instance.getSelectedNickname());
-    }
-
-    /**
-     * Test selected nickname behaviour upon deleting nickname.
-     */
-    @Test
-    public void testDeleteNicknameNotSelected() {
-        final Profile profile = createProfile("1");
-        final String first = "1nickname";
-        final String second = "1nickname2";
-        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
-        instance.addProfile(profile);
-        instance.setSelectedProfile(profile);
-        instance.addNickname(second);
-        instance.setSelectedNickname(second);
-        assertEquals(second, instance.getSelectedNickname());
-        instance.deleteNickname(first);
-        assertEquals(second, instance.getSelectedNickname());
-    }
-
-    /**
-     * Test selected nickname behaviour upon deleting nickname.
-     */
-    @Test
-    public void testDeleteNicknameLastNickname() {
-        final Profile profile = createProfile("1");
-        final String first = "1nickname";
-        final String second = "1nickname2";
-        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
-        instance.addProfile(profile);
-        instance.setSelectedProfile(profile);
-        instance.addNickname(second);
-        instance.setSelectedNickname(second);
-        assertEquals(second, instance.getSelectedNickname());
-        instance.deleteNickname(second);
-        assertEquals(first, instance.getSelectedNickname());
-    }
-
-    /**
-     * Test selected nickname behaviour upon deleting nickname.
-     */
-    @Test
-    public void testDeleteNicknameFirstNickname() {
-        final Profile profile = createProfile("1");
-        final String first = "1nickname";
-        final String second = "1nickname2";
-        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
-        instance.addProfile(profile);
-        instance.setSelectedProfile(profile);
-        instance.addNickname(second);
-        instance.setSelectedNickname(first);
-        assertEquals(first, instance.getSelectedNickname());
-        instance.deleteNickname(first);
-        assertEquals(second, instance.getSelectedNickname());
-    }
-
-    /**
-     * Test selected nickname behaviour upon deleting nickname.
-     */
-    @Test
-    public void testDeleteNicknameMiddleNickname() {
-        final Profile profile = createProfile("1");
-        final String first = "1nickname";
-        final String second = "1nickname2";
-        final String third = "1nickname3";
-        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
-        instance.addProfile(profile);
-        instance.setSelectedProfile(profile);
-        instance.addNickname(second);
-        instance.addNickname(third);
-        instance.setSelectedNickname(second);
-        assertEquals(second, instance.getSelectedNickname());
-        instance.deleteNickname(second);
-        assertEquals(first, instance.getSelectedNickname());
-    }
-
-    /**
-     * Test selected nickname behaviour upon deleting nickname.
-     */
-    @Test
-    public void testDeleteNicknameOnlyNickname() {
-        final Profile profile = createProfile("1");
-        final String first = "1nickname";
-        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
-        instance.addProfile(profile);
-        instance.setSelectedProfile(profile);
-        instance.setSelectedNickname(first);
-        assertEquals(first, instance.getSelectedNickname());
-        instance.deleteNickname(first);
-        assertNull(instance.getSelectedNickname());
-    }
-
-    /**
-     * Test of setSelectedNickname method, of class ProfileManagerModel.
-     */
-    @Test
-    public void testGetAndSetSelectedNickname() {
-        final String selectedNickname = "1nickname";
-        final ProfileManagerModel instance = createModel();
-        assertNull(instance.getSelectedNickname());
-        instance.setSelectedNickname(selectedNickname);
-        assertEquals(selectedNickname, instance.getSelectedNickname());
-        instance.setSelectedNickname("foo");
-        assertNotSame("foo", instance.getSelectedNickname());
-    }
-
-    /**
-     * Test of editNickname method, of class ProfileManagerModel.
-     */
-    @Test
-    public void testEditNickname() {
-        final ProfileManagerModel instance = createModel();
-        final List<String> nicknames = new ArrayList<>(instance.getNicknames());
-        final String nickname = nicknames.get(0);
-        assertEquals(nicknames, instance.getNicknames());
-        instance.editNickname(nickname, "foo");
-        final int index = nicknames.indexOf(nickname);
-        nicknames.remove(nickname);
-        nicknames.add(index, "foo");
-        assertEquals(nicknames, instance.getNicknames());
-    }
-
-    /**
-     * Test of getName method, of class ProfileManagerModel.
-     */
-    @Test
-    public void testGetAndSetName() {
-        final ProfileManagerModel instance = createModel();
-        final String name = defaultProfile.getName();
-        final String newName = "foo";
-        assertEquals(name, instance.getName());
-        instance.setName(newName);
-        assertEquals(newName, ((Profile) instance.getSelectedProfile()).getName());
-    }
-
-    /**
-     * Test of getRealname method, of class ProfileManagerModel.
-     */
-    @Test
-    public void testGetAndSetRealname() {
-        final ProfileManagerModel instance = createModel();
-        final String name = "1realname";
-        final String newName = "foo";
-        assertEquals(name, instance.getRealname());
-        instance.setRealname(newName);
-        assertEquals(newName, ((Profile) instance.getSelectedProfile()).getRealname());
-    }
-
-    /**
-     * Test of getIdent method, of class ProfileManagerModel.
-     */
-    @Test
-    public void testGetAndSetIdent() {
-        final ProfileManagerModel instance = createModel();
-        final String name = "1ident";
-        final String newName = "foo";
-        assertEquals(name, instance.getIdent());
-        instance.setIdent(newName);
-        assertEquals(newName, ((Profile) instance.getSelectedProfile()).getIdent());
-    }
-
-    /**
-     * Test of isManipulateProfileAllowed method, of class ProfileManagerModel.
-     */
-    @Test
-    public void testIsManipulateProfileAllowed() {
-        final ProfileManagerModel instance = createModel();
-        assertTrue(instance.isManipulateProfileAllowed());
-        instance.setProfiles(Arrays.asList(new Profile[]{}));
-        assertFalse(instance.isManipulateProfileAllowed());
-    }
-
-    /**
-     * Test of isManipulateNicknameAllowed method, of class ProfileManagerModel.
-     */
-    @Test
-    public void testIsManipulateNicknameAllowed() {
-        final ProfileManagerModel instance = createModel();
-        assertFalse(instance.isManipulateNicknameAllowed());
-        instance.setSelectedNickname("1nickname");
-        assertTrue(instance.isManipulateNicknameAllowed());
-    }
-
-    @Test
-    public void testIsChangeProfileAllowed() {
-        final Profile profile = new Profile("New Profile", null);
-        profile.setName("*");
-        profile.setRealname("");
-        profile.setIdent("*");
-        final ProfileManagerModel instance = createModel();
-        assertTrue(instance.isChangeProfileAllowed());
-        instance.setProfiles(Arrays.asList(new Profile[]{profile,}));
-        assertFalse(instance.isChangeProfileAllowed());
-        profile.setName("profile");
-        assertFalse(instance.isChangeProfileAllowed());
-        profile.addNickname("nickname");
-        assertFalse(instance.isChangeProfileAllowed());
-        profile.setRealname("realname");
-        assertFalse(instance.isChangeProfileAllowed());
-        profile.setIdent("ident");
-        assertTrue(instance.isChangeProfileAllowed());
-    }
-
-    /**
-     * Test of isOKAllowed method, of class ProfileManagerModel.
-     */
-    @Test
-    public void testIsOKAllowed() {
-        final Profile profile = new Profile("New Profile", null);
-        profile.setName("*");
-        profile.setRealname("");
-        profile.setIdent("*");
-        final ProfileManagerModel instance = createModel();
-        assertTrue(instance.isOKAllowed());
-        instance.setProfiles(Arrays.asList(new Profile[]{}));
-        assertFalse(instance.isOKAllowed());
-        instance.setProfiles(Arrays.asList(new Profile[]{profile,}));
-        assertFalse(instance.isOKAllowed());
-        profile.setName("profile");
-        assertFalse(instance.isOKAllowed());
-        profile.addNickname("nickname");
-        assertFalse(instance.isOKAllowed());
-        profile.setRealname("realname");
-        assertFalse(instance.isOKAllowed());
-        profile.setIdent("ident");
-        assertTrue(instance.isOKAllowed());
-    }
-
-    /**
-     * Test of isNameValid method, of class ProfileManagerModel.
-     */
-    @Test
-    public void testIsNameInValid() {
-        final ProfileManagerModel instance = createModel();
-        instance.setProfiles(Arrays.asList(defaultProfile));
-        instance.setName("\\");
-        assertTrue(instance.isNameValid().isFailure());
-    }
-
-    /**
-     * Test of isNameValid method, of class ProfileManagerModel.
-     */
-    @Test
-    public void testIsNameValid() {
-        final ProfileManagerModel instance = createModel();
-        instance.setProfiles(Arrays.asList(defaultProfile));
-        instance.setName("profile");
-        assertFalse(instance.isNameValid().isFailure());
-    }
-
-    /**
-     * Test of isNicknamesValid method, of class ProfileManagerModel.
-     */
-    @Test
-    public void testIsNicknamesInValid() {
-        final ProfileManagerModel instance = createModel();
-        instance.setProfiles(Arrays.asList(defaultProfile));
-        instance.setNicknames(Arrays.asList(new String[]{}));
-        assertTrue(instance.isNicknamesValid().isFailure());
-    }
-
-    /**
-     * Test of isNicknamesValid method, of class ProfileManagerModel.
-     */
-    @Test
-    public void testIsNicknamesValid() {
-        final ProfileManagerModel instance = createModel();
-        instance.setProfiles(Arrays.asList(defaultProfile));
-        instance.setNicknames(Arrays.asList(new String[]{"nickname"}));
-        assertFalse(instance.isNicknamesValid().isFailure());
-    }
-
-    /**
-     * Test of isRealnameValid method, of class ProfileManagerModel.
-     */
-    @Test
-    public void testIsRealnameInValid() {
-        final ProfileManagerModel instance = createModel();
-        instance.setProfiles(Arrays.asList(defaultProfile));
-        instance.setRealname("");
-        assertTrue(instance.isRealnameValid().isFailure());
-    }
-
-    /**
-     * Test of isRealnameValid method, of class ProfileManagerModel.
-     */
-    @Test
-    public void testIsRealnameValid() {
-        final ProfileManagerModel instance = createModel();
-        instance.setProfiles(Arrays.asList(defaultProfile));
-        instance.setRealname("realname");
-        assertFalse(instance.isRealnameValid().isFailure());
-    }
-
-    /**
-     * Test of isIdentValid method, of class ProfileManagerModel.
-     */
-    @Test
-    public void testIsIdentInValid() {
-        final ProfileManagerModel instance = createModel();
-        instance.setProfiles(Arrays.asList(defaultProfile));
-        instance.setIdent("*");
-        assertTrue(instance.isIdentValid().isFailure());
-    }
-
-    /**
-     * Test of isIdentValid method, of class ProfileManagerModel.
-     */
-    @Test
-    public void testIsIdentValid() {
-        final ProfileManagerModel instance = createModel();
-        instance.setProfiles(Arrays.asList(defaultProfile));
-        instance.setIdent("ident");
-        assertFalse(instance.isIdentValid().isFailure());
-    }
-
-    /**
-     * Test of isIdentValid method, of class ProfileManagerModel.
-     */
-    @Test
-    public void testIsIdentValidEmptyString() {
-        final ProfileManagerModel instance = createModel();
-        instance.setProfiles(Arrays.asList(defaultProfile));
-        instance.setIdent("");
-        assertFalse(instance.isIdentValid().isFailure());
-    }
-
-    /**
-     * Test getters without selected profiles.
-     */
-    @Test
-    public void testNullSelectedProfileGetters() {
-        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
-        assertTrue("".equals(instance.getSelectedNickname()));
-        assertTrue("".equals(instance.getName()));
-        assertTrue("".equals(instance.getRealname()));
-        assertTrue("".equals(instance.getIdent()));
-        assertTrue(instance.getNicknames().isEmpty());
-    }
-
-    /**
-     * Test validators without selected profiles.
-     */
-    @Test
-    public void testNullSelectedProfileValidators() {
-        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
-        assertFalse(instance.isNameValid().isFailure());
-        assertFalse(instance.isNicknamesValid().isFailure());
-        assertFalse(instance.isRealnameValid().isFailure());
-        assertFalse(instance.isIdentValid().isFailure());
-    }
-
-    /**
-     * Test setters without selected profiles.
-     */
-    @Test
-    public void testNullSelectedProfileSetSelectedNickname() {
-        final String test = "test";
-        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
-        assertTrue("".equals(instance.getSelectedNickname()));
-        instance.setSelectedNickname(test);
-        assertTrue("".equals(instance.getSelectedNickname()));
-    }
-
-    /**
-     * Test setters without selected profiles.
-     */
-    @Test
-    public void testNullSelectedProfileSetName() {
-        final String test = "test";
-        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
-        assertTrue("".equals(instance.getName()));
-        instance.setName(test);
-        assertTrue("".equals(instance.getName()));
-    }
-
-    /**
-     * Test setters without selected profiles.
-     */
-    @Test
-    public void testNullSelectedProfileSetRealname() {
-        final String test = "test";
-        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
-        assertTrue("".equals(instance.getRealname()));
-        instance.setRealname(test);
-        assertTrue("".equals(instance.getRealname()));
-    }
-
-    /**
-     * Test setters without selected profiles.
-     */
-    @Test
-    public void testNullSelectedProfileSetIdent() {
-        final String test = "test";
-        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
-        assertTrue("".equals(instance.getIdent()));
-        instance.setIdent(test);
-        assertTrue("".equals(instance.getIdent()));
-    }
-
-    /**
-     * Test setters without selected profiles.
-     */
-    @Test
-    public void testNullSelectedProfileSetNicknames() {
-        final String test = "test";
-        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
-        assertTrue(instance.getNicknames().isEmpty());
-        instance.setNicknames(Arrays.asList(new String[]{test, }));
-        assertTrue(instance.getNicknames().isEmpty());
-    }
-
-    /**
-     * Test setters without selected profiles.
-     */
-    @Test
-    public void testNullSelectedProfileAddNickname() {
-        final String test = "test";
-        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
-        assertTrue(instance.getNicknames().isEmpty());
-        instance.addNickname(test);
-        assertTrue(instance.getNicknames().isEmpty());
-    }
-
-    /**
-     * Test setters without selected profiles.
-     */
-    @Test
-    public void testNullSelectedProfileDeleteNickname() {
-        final String test = "test";
-        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
-        assertTrue(instance.getNicknames().isEmpty());
-        instance.deleteNickname(test);
-        assertTrue(instance.getNicknames().isEmpty());
-    }
-
-    /**
-     * Test method save of class ProfileManagerModel
-     *
-     * @throws IOException
-     */
-    @Test
-    public void save() throws IOException {
-        final Profile first = mock(Profile.class);
-        final Profile second = mock(Profile.class);
-        when(first.isDeleted()).thenReturn(false);
-        when(second.isDeleted()).thenReturn(true);
-        final ProfileManagerModel instance = new ProfileManagerModel(manager, identityFactory);
-        instance.setProfiles(Arrays.asList(new Profile[]{first, second, }));
-        instance.save();
-        verify(first).save();
-        verify(second).delete();
-    }
-}

ui_swing/test/com/dmdirc/addons/ui_swing/dialogs/profiles/ProfileNameValidatorTest.java

@@ -1,87 +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.profiles;
-
-import com.dmdirc.actions.wrappers.Profile;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.when;
-
-/**
- * ProfileNameValidator tests.
- */
-@RunWith(MockitoJUnitRunner.class)
-public class ProfileNameValidatorTest {
-
-    @Mock private Profile other;
-    @Mock private Profile selected;
-    @Mock private ProfileManagerModel model;
-    private List<Profile> profiles;
-
-    @Before
-    public void setup() {
-        when(other.getName()).thenReturn("other");
-        when(selected.getName()).thenReturn("selected");
-        profiles = new ArrayList<>(2);
-        profiles.add(selected);
-        profiles.add(other);
-        when(model.getProfiles()).thenReturn(profiles);
-        when(model.getSelectedProfile()).thenReturn(selected);
-    }
-
-    /**
-     * Test of validate method, of class ProfileNameValidator.
-     */
-    @Test
-    public void testValidateNoDupes() {
-        final ProfileRenameValidator instance = new ProfileRenameValidator(model);
-        assertFalse(instance.validate("Random").isFailure());
-    }
-
-    /**
-     * Test of validate method, of class ProfileNameValidator.
-     */
-    @Test
-    public void testValidateNonSelectedDupe() {
-        final ProfileRenameValidator instance = new ProfileRenameValidator(model);
-        assertTrue(instance.validate("other").isFailure());
-    }
-
-    /**
-     * Test of validate method, of class ProfileNameValidator.
-     */
-    @Test
-    public void testValidateSelectedDupe() {
-        final ProfileRenameValidator instance = new ProfileRenameValidator(model);
-        assertFalse(instance.validate("selected").isFailure());
-    }
-}