Ask user for profile name on creation.

Change-Id: Id8f99a90564e09d64d12e0a9edfdccb5a5a25524
Fixes-Issue: CLIENT-434
Reviewed-on: http://gerrit.dmdirc.com/3149
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

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

@@ -25,11 +25,14 @@ package com.dmdirc.addons.ui_swing.dialogs.profiles;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityFactory;
 
+import com.google.common.base.Preconditions;
+
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 
-import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
 
 /**
  * Profile wrapper class.
@@ -54,35 +57,33 @@ public class Profile {
     /**
      * Creates a new profile.
      *
+     * @param name            Profile name
      * @param identityFactory The factory to use to create the profile's config file when saving.
      */
-    public Profile(final IdentityFactory identityFactory) {
-        this(identityFactory, null);
+    public Profile(final String name, final IdentityFactory identityFactory) {
+        this.identityFactory = identityFactory;
+        this.configProvider = null;
+        this.name = name;
+        this.nicknames = new ArrayList<>(Arrays.asList(name));
+        this.realname = name;
+        this.ident = "";
     }
 
     /**
      * Creates a new profile based off the specified Identity.
      *
      * @param identityFactory The factory to use to create the profile's config file when saving.
-     * @param configProvider  Provider to read existing profile from. If null, a blank profile is
-     *                        created.
+     * @param configProvider  Provider to read existing profile from.
      */
     public Profile(final IdentityFactory identityFactory,
-            @Nullable final ConfigProvider configProvider) {
+            @Nonnull final ConfigProvider configProvider) {
+        Preconditions.checkNotNull(configProvider);
         this.identityFactory = identityFactory;
         this.configProvider = configProvider;
-
-        if (configProvider == null) {
-            name = "New Profile";
-            nicknames = new ArrayList<>();
-            realname = "";
-            ident = "";
-        } else {
-            name = configProvider.getOption("identity", "name");
-            nicknames = configProvider.getOptionList("profile", "nicknames");
-            realname = configProvider.getOption("profile", "realname");
-            ident = configProvider.getOption("profile", "ident");
-        }
+        this.name = configProvider.getOption("identity", "name");
+        this.nicknames = configProvider.getOptionList("profile", "nicknames");
+        this.realname = configProvider.getOption("profile", "realname");
+        this.ident = configProvider.getOption("profile", "ident");
     }
 
     public String getName() {

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

@@ -43,9 +43,13 @@ public class ProfileManagerController {
         this.identityFactory = identityFactory;
     }
 
-    /** Adds a new profile. */
-    public void addProfile() {
-        model.addProfile(new Profile(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. */

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

@@ -163,17 +163,18 @@ public class ProfileManagerDialogLinker {
             public void actionPerformed(final ActionEvent e) {
                 new StandardInputDialog(dialog, ModalityType.DOCUMENT_MODAL, iconManager,
                         "Add nickname", "Enter nickname to add:", new AddNicknameValidator(model)) {
-                    private static final long serialVersionUID = 1L;
-                    @Override
-                    public boolean save() {
-                        controller.addNickname(getText());
-                        return true;
-                    }
-
-                    @Override
-                    public void cancelled() {
-                    }
-                }.display();
+                            private static final long serialVersionUID = 1L;
+
+                            @Override
+                            public boolean save() {
+                                controller.addNickname(getText());
+                                return true;
+                            }
+
+                            @Override
+                            public void cancelled() {
+                            }
+                        }.display();
             }
         });
         model.addPropertyChangeListener("selectedprofile", new PropertyChangeListener() {
@@ -204,17 +205,18 @@ public class ProfileManagerDialogLinker {
                         ModalityType.DOCUMENT_MODAL, iconManager,
                         "Add nickname", "Enter edited nickname:",
                         new EditNicknameValidator(model)) {
-                    private static final long serialVersionUID = 1L;
-                    @Override
-                    public boolean save() {
-                        controller.editNickname(getText());
-                        return true;
-                    }
-
-                    @Override
-                    public void cancelled() {
-                    }
-                };
+                            private static final long serialVersionUID = 1L;
+
+                            @Override
+                            public boolean save() {
+                                controller.editNickname(getText());
+                                return true;
+                            }
+
+                            @Override
+                            public void cancelled() {
+                            }
+                        };
                 inputDialog.setText((String) model.getSelectedNickname());
                 inputDialog.display();
             }
@@ -239,17 +241,18 @@ public class ProfileManagerDialogLinker {
             public void actionPerformed(final ActionEvent e) {
                 new StandardQuestionDialog(dialog, ModalityType.DOCUMENT_MODAL,
                         "Delete nickname?", "Are you sure you want to delete this nickname?") {
-                    private static final long serialVersionUID = 1L;
-                    @Override
-                    public boolean save() {
-                        controller.deleteNickname();
-                        return true;
-                    }
-
-                    @Override
-                    public void cancelled() {
-                    }
-                }.display();
+                            private static final long serialVersionUID = 1L;
+
+                            @Override
+                            public boolean save() {
+                                controller.deleteNickname();
+                                return true;
+                            }
+
+                            @Override
+                            public void cancelled() {
+                            }
+                        }.display();
             }
         });
         model.addPropertyChangeListener("selectednickname", new PropertyChangeListener() {
@@ -395,7 +398,24 @@ public class ProfileManagerDialogLinker {
         addProfile.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(final ActionEvent e) {
-                controller.addProfile();
+                final StandardInputDialog inputDialog = new StandardInputDialog(dialog,
+                        ModalityType.DOCUMENT_MODAL, iconManager,
+                        "Add profile", "New profile name:",
+                        new ProfileNameValidator(model.getProfiles())) {
+                            private static final long serialVersionUID = 1L;
+
+                            @Override
+                            public boolean save() {
+                                controller.addProfile(getText());
+                                return true;
+                            }
+
+                            @Override
+                            public void cancelled() {
+                            }
+                        };
+                inputDialog.setText((String) model.getSelectedNickname());
+                inputDialog.display();
             }
         });
     }
@@ -411,17 +431,18 @@ public class ProfileManagerDialogLinker {
             public void actionPerformed(final ActionEvent e) {
                 new StandardQuestionDialog(dialog, ModalityType.DOCUMENT_MODAL,
                         "Delete profile?", "Are you sure you want to delete this profile?") {
-                    private static final long serialVersionUID = 1L;
-                    @Override
-                    public boolean save() {
-                        controller.deleteProfile();
-                        return true;
-                    }
-
-                    @Override
-                    public void cancelled() {
-                    }
-                }.display();
+                            private static final long serialVersionUID = 1L;
+
+                            @Override
+                            public boolean save() {
+                                controller.deleteProfile();
+                                return true;
+                            }
+
+                            @Override
+                            public void cancelled() {
+                            }
+                        }.display();
             }
         });
         model.addPropertyChangeListener("profiles", new PropertyChangeListener() {

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

@@ -443,7 +443,7 @@ public class ProfileManagerModel {
         if (filenameValidation.isFailure()) {
             return filenameValidation;
         }
-        return new ProfileNameValidator(profiles, selectedProfile).validate(
+        return new ProfileRenameValidator(profiles, selectedProfile).validate(
                 selectedProfile.getName());
     }
 

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

@@ -28,25 +28,21 @@ import com.dmdirc.util.validators.Validator;
 import java.util.List;
 
 /**
- * Ensures profile names are unique.
+ * Validates a profile name ensuring its uniqueness and validity as a filename.
  */
-class ProfileNameValidator implements Validator<String> {
+public class ProfileNameValidator implements Validator<String> {
 
     /** List of profiles to validate. */
     private final List<Profile> profiles;
-    /** Currently selected profile. */
-    private final Profile selectedProfile;
 
-    public ProfileNameValidator(final List<Profile> profiles, final Profile selectedProfile) {
+    public ProfileNameValidator(final List<Profile> profiles) {
         this.profiles = profiles;
-        this.selectedProfile = selectedProfile;
     }
 
     @Override
     public ValidationResponse validate(final String object) {
         for (Profile targetprofile : profiles) {
-            if (targetprofile != selectedProfile
-                    && targetprofile.getName().equalsIgnoreCase(object)) {
+            if (targetprofile.getName().equalsIgnoreCase(object)) {
                 return new ValidationResponse("Profile names must be unique");
             }
         }

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

@@ -0,0 +1,56 @@
+/*
+ * 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;
+import com.dmdirc.util.validators.Validator;
+
+import java.util.List;
+
+/**
+ * Ensures profile names are unique.
+ */
+class ProfileRenameValidator implements Validator<String> {
+
+    /** List of profiles to validate. */
+    private final List<Profile> profiles;
+    /** Currently selected profile. */
+    private final Profile selectedProfile;
+
+    public ProfileRenameValidator(final List<Profile> profiles, final Profile selectedProfile) {
+        this.profiles = profiles;
+        this.selectedProfile = selectedProfile;
+    }
+
+    @Override
+    public ValidationResponse validate(final String object) {
+        for (Profile targetprofile : profiles) {
+            if (targetprofile != selectedProfile
+                    && targetprofile.getName().equalsIgnoreCase(object)) {
+                return new ValidationResponse("Profile names must be unique");
+            }
+        }
+        return new ValidationResponse();
+    }
+
+}

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

@@ -29,7 +29,9 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 /**
  * Tests for ProfileManagerController.
@@ -53,8 +55,8 @@ public class ProfileManagerControllerTest {
      */
     @Test
     public void testAddProfile() {
-        instance.addProfile();
-        verify(model).addProfile(new Profile(identityFactory));
+        instance.addProfile("New Profile");
+        verify(model).addProfile(new Profile("New Profile", identityFactory));
     }
 
     /**

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

@@ -509,7 +509,7 @@ public class ProfileManagerModelTest {
      */
     @Test
     public void testIsOKAllowed() {
-        final Profile profile = new Profile(null);
+        final Profile profile = new Profile("New Profile", null);
         profile.setName("*");
         profile.setRealname("");
         profile.setIdent("*");

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

@@ -46,7 +46,7 @@ public class ProfileNameValidatorTest {
         final List<Profile> profiles = new ArrayList<>();
         profiles.add(selected);
         profiles.add(other);
-        ProfileNameValidator instance = new ProfileNameValidator(profiles, selected);
+        ProfileRenameValidator instance = new ProfileRenameValidator(profiles, selected);
         assertFalse(instance.validate("Random").isFailure());
     }
 
@@ -62,7 +62,7 @@ public class ProfileNameValidatorTest {
         final List<Profile> profiles = new ArrayList<>();
         profiles.add(selected);
         profiles.add(other);
-        ProfileNameValidator instance = new ProfileNameValidator(profiles, selected);
+        ProfileRenameValidator instance = new ProfileRenameValidator(profiles, selected);
         assertTrue(instance.validate("other").isFailure());
     }
 
@@ -78,7 +78,7 @@ public class ProfileNameValidatorTest {
         final List<Profile> profiles = new ArrayList<>();
         profiles.add(selected);
         profiles.add(other);
-        ProfileNameValidator instance = new ProfileNameValidator(profiles, selected);
+        ProfileRenameValidator instance = new ProfileRenameValidator(profiles, selected);
         assertFalse(instance.validate("selected").isFailure());
     }
 }

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

@@ -66,11 +66,11 @@ public class ProfileTest {
      */
     @Test
     public void testEmptyConstructor() {
-        Profile instance = new Profile(identityFactory);
+        Profile instance = new Profile("New Profile", identityFactory);
         assertEquals("", instance.getIdent());
         assertEquals("New Profile", instance.getName());
-        assertEquals(new ArrayList<String>(), instance.getNicknames());
-        assertEquals("", instance.getRealname());
+        assertEquals(new ArrayList<>(Arrays.asList("New Profile")), instance.getNicknames());
+        assertEquals("New Profile", instance.getRealname());
     }
 
     /**
@@ -170,7 +170,7 @@ public class ProfileTest {
 
         when(identityFactory.createProfileConfig("New Profile")).thenReturn(configProvider);
 
-        Profile instance = new Profile(identityFactory, null);
+        Profile instance = new Profile("New Profile", identityFactory);
         instance.save();
         verify(identityFactory).createProfileConfig("New Profile");
     }
@@ -244,7 +244,7 @@ public class ProfileTest {
      */
     @Test
     public void testDeleteNullIdentity() {
-        Profile instance = new Profile(null);
+        Profile instance = new Profile("New Profile", null);
         instance.delete();
     }
 }