Add NewServerDialog and associated classes.

Change-Id: Id9a2531ee37ca4eee133e3bfa3183d21f8508ea5
Reviewed-on: http://gerrit.dmdirc.com/3596
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

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

@@ -26,7 +26,7 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.ServerState;
 import com.dmdirc.addons.ui_swing.Apple;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
-import com.dmdirc.addons.ui_swing.dialogs.NewServerDialog;
+import com.dmdirc.addons.ui_swing.dialogs.newserver.NewServerDialog;
 import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
 import com.dmdirc.addons.ui_swing.injection.DialogProvider;
 import com.dmdirc.addons.ui_swing.injection.KeyedDialogProvider;

src/com/dmdirc/addons/ui_swing/components/validating/IntegerJTextComponentComponentValidator.java

@@ -0,0 +1,77 @@
+/*
+ * 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.components.validating;
+
+import com.dmdirc.util.validators.Validator;
+
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import javax.swing.text.JTextComponent;
+
+/**
+ * JTextComponent for integer input.
+ */
+public class IntegerJTextComponentComponentValidator
+        extends ComponentValidator<Integer, JTextComponent> implements DocumentListener {
+
+    /**
+     * Creates a new validator.
+     *
+     * @param textArea  Text component to validate
+     * @param validator Validator to validate against
+     */
+    public IntegerJTextComponentComponentValidator(final JTextComponent textArea,
+            final Validator<Integer> validator) {
+        super(textArea, validator);
+    }
+
+    @Override
+    public Integer getValidatable() {
+        try {
+            return Integer.parseInt(getComponent().getText());
+        } catch (NumberFormatException ex) {
+            return -1;
+        }
+    }
+
+    @Override
+    public void addHooks() {
+        getComponent().getDocument().addDocumentListener(this);
+    }
+
+    @Override
+    public void insertUpdate(final DocumentEvent e) {
+        validate();
+    }
+
+    @Override
+    public void removeUpdate(final DocumentEvent e) {
+        validate();
+    }
+
+    @Override
+    public void changedUpdate(final DocumentEvent e) {
+        validate();
+    }
+
+}

src/com/dmdirc/addons/ui_swing/components/validating/JComboBoxComponentValidator.java

@@ -0,0 +1,75 @@
+/*
+ * 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.components.validating;
+
+import com.dmdirc.util.validators.Validator;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.JComboBox;
+import javax.swing.ListModel;
+import javax.swing.event.ListDataEvent;
+import javax.swing.event.ListDataListener;
+
+public class JComboBoxComponentValidator<T> extends ComponentValidator<List<T>, JComboBox<T>> {
+
+    public JComboBoxComponentValidator(final JComboBox<T> component,
+            final Validator<List<T>> validator) {
+        super(component, validator);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public List<T> getValidatable() {
+        final int size = getComponent().getModel().getSize();
+        final List<T> items = new ArrayList<T>(size);
+        final ListModel<T> model = getComponent().getModel();
+        for (int i = 0; i < size; i++) {
+            items.add(model.getElementAt(i));
+        }
+        return items;
+    }
+
+    @Override
+    public void addHooks() {
+        getComponent().getModel().addListDataListener(new ListDataListener() {
+
+            @Override
+            public void intervalAdded(final ListDataEvent e) {
+                validate();
+            }
+
+            @Override
+            public void intervalRemoved(final ListDataEvent e) {
+                validate();
+            }
+
+            @Override
+            public void contentsChanged(final ListDataEvent e) {
+                validate();
+            }
+        });
+    }
+
+}

src/com/dmdirc/addons/ui_swing/components/validating/ValidationFactory.java

@@ -28,6 +28,7 @@ import com.dmdirc.util.validators.Validator;
 import java.awt.Component;
 import java.util.List;
 
+import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.swing.JLayer;
 import javax.swing.JList;
@@ -77,6 +78,41 @@ public class ValidationFactory {
         return getPanel(display, componentValidator, iconManager);
     }
 
+    /**
+     * Retrieves a validating component panel for the given component.
+     *
+     * @param validation  Component to validate
+     * @param validator   Validator to validate against
+     * @param iconManager Icon manager to get icons from
+     *
+     * @return Validating component panel for the component
+     */
+    public static JComponent getIntValidatorPanel(final JTextComponent validation,
+            final Validator<Integer> validator, final IconManager iconManager) {
+        return getIntValidatorPanel(validation, validation, validator, iconManager);
+    }
+
+    /**
+     * Retrieves a validating component panel for the given component.
+     *
+     *
+     * @param display     Component to display instead in the panel
+     * @param validation  Component to validate
+     * @param validator   Validator to validate against
+     * @param iconManager Icon manager to get icons from
+     *
+     * @param <T>         Type of component to wrap in the layer UI
+     *
+     * @return Validating component panel for the component
+     */
+    public static <T extends Component> JComponent getIntValidatorPanel(final T display,
+            final JTextComponent validation, final Validator<Integer> validator,
+            final IconManager iconManager) {
+        final ComponentValidator<Integer, JTextComponent> componentValidator
+                = new IntegerJTextComponentComponentValidator(validation, validator);
+        return getPanel(display, componentValidator, iconManager);
+    }
+
     /**
      * Retrieves a validating component panel for the given component.
      *
@@ -115,6 +151,44 @@ public class ValidationFactory {
         return getPanel(display, componentValidator, iconManager);
     }
 
+    /**
+     * Retrieves a validating component panel for the given component.
+     *
+     * @param validation  Component to validate
+     * @param validator   Validator to validate against
+     * @param iconManager Icon manager to get icons from
+     *
+     * @param <T>         Type of component to wrap in the layer UI
+     *
+     * @return Validating component panel for the component
+     */
+    public static <T> JComponent getValidatorPanel(
+            final JComboBox<T> validation, final Validator<List<T>> validator,
+            final IconManager iconManager) {
+        return getValidatorPanel(validation, validation, validator, iconManager);
+    }
+
+    /**
+     * Retrieves a validating component panel for the given component.
+     *
+     * @param display     Component to display instead in the panel
+     * @param validation  Component to validate
+     * @param validator   Validator to validate against
+     * @param iconManager Icon manager to get icons from
+     *
+     * @param <T>         Type of component to wrap in the layer UI
+     * @param <V>         The type of item in the model that will be validated.
+     *
+     * @return Validating component panel for the component
+     */
+    public static <T extends Component, V> JComponent getValidatorPanel(final T display,
+            final JComboBox<V> validation, final Validator<List<V>> validator,
+            final IconManager iconManager) {
+        final ComponentValidator<List<V>, JComboBox<V>> componentValidator
+                = new JComboBoxComponentValidator<>(validation, validator);
+        return getPanel(display, componentValidator, iconManager);
+    }
+
     private static <T extends Component> JComponent getPanel(
             final T display,
             final ComponentValidator<?, ? extends JComponent> componentValidator,

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

@@ -1,371 +0,0 @@
-/*
- * Copyright (c) 2006-2014 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.ui_swing.dialogs;
-
-import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.ServerManager;
-import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
-import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
-import com.dmdirc.addons.ui_swing.components.vetoable.VetoableComboBoxModel;
-import com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog;
-import com.dmdirc.addons.ui_swing.injection.DialogProvider;
-import com.dmdirc.addons.ui_swing.injection.MainWindow;
-import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
-import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigProvider;
-import com.dmdirc.interfaces.config.ConfigProviderListener;
-import com.dmdirc.interfaces.config.IdentityController;
-import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
-import com.dmdirc.ui.IconManager;
-import com.dmdirc.util.validators.PortValidator;
-import com.dmdirc.util.validators.ServerNameValidator;
-
-import java.awt.Insets;
-import java.awt.Window;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyVetoException;
-import java.beans.VetoableChangeListener;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.swing.BorderFactory;
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JPasswordField;
-import javax.swing.JTextField;
-import javax.swing.MutableComboBoxModel;
-import javax.swing.WindowConstants;
-
-import net.miginfocom.swing.MigLayout;
-
-/**
- * Dialog that allows the user to enter details of a new server to connect to.
- */
-public class NewServerDialog extends StandardDialog implements
-        ActionListener, VetoableChangeListener, ConfigProviderListener {
-
-    /** Serial version UID. */
-    private static final long serialVersionUID = 8;
-    /** Identity Manager. */
-    private final IdentityController identityController;
-    /** Server manager. */
-    private final ServerManager serverManager;
-    /** Icon manager. */
-    private final IconManager iconManager;
-    /** Config. */
-    private final AggregateConfigProvider config;
-    /** Active frame manager. */
-    private final ActiveFrameManager activeFrameManager;
-    /** checkbox. */
-    private JCheckBox newServerWindowCheck;
-    /** checkbox. */
-    private JCheckBox sslCheck;
-    /** text field. */
-    private ValidatingJTextField serverField;
-    /** text field. */
-    private ValidatingJTextField portField;
-    /** text field. */
-    private JTextField passwordField;
-    /** combo box. */
-    private JComboBox<ConfigProvider> identityField;
-    /** button. */
-    private JButton editProfileButton;
-    /** Opening new server? */
-    private boolean openingServer = false;
-    /** Provider to use to retrieve PMDs. */
-    private final DialogProvider<ProfileManagerDialog> profileDialogProvider;
-
-    /**
-     * Creates a new instance of the dialog.
-     *
-     * @param mainWindow            Main window to use as a parent.
-     * @param activeFrameManager    The active window manager
-     * @param config                Config
-     * @param iconManager           Icon manager
-     * @param identityController    Identity controller
-     * @param serverManager         Server manager
-     * @param profileDialogProvider Provider to use to retrieve PMDs.
-     */
-    @Inject
-    public NewServerDialog(
-            @MainWindow final Window mainWindow,
-            final ActiveFrameManager activeFrameManager,
-            @GlobalConfig final AggregateConfigProvider config,
-            @GlobalConfig final IconManager iconManager,
-            final IdentityController identityController,
-            final ServerManager serverManager,
-            final DialogProvider<ProfileManagerDialog> profileDialogProvider) {
-        super(mainWindow, ModalityType.MODELESS);
-        this.identityController = identityController;
-        this.serverManager = serverManager;
-        this.activeFrameManager = activeFrameManager;
-        this.iconManager = iconManager;
-        this.config = config;
-        this.profileDialogProvider = profileDialogProvider;
-
-        initComponents();
-        layoutComponents();
-        addListeners();
-        setResizable(false);
-
-        identityController.registerIdentityListener("profile", this);
-        update();
-    }
-
-    @Override
-    public void display() {
-        super.display();
-        requestFocusInWindow();
-        serverField.selectAll();
-        serverField.requestFocus();
-    }
-
-    /** Updates the values to defaults. */
-    private void update() {
-        serverField.setText(config.getOption("general", "server"));
-        portField.setText(config.getOption("general", "port"));
-        passwordField.setText(config.getOption("general", "password"));
-        sslCheck.setSelected(false);
-        newServerWindowCheck.setEnabled(false);
-
-        serverField.requestFocusInWindow();
-
-        if (serverManager.numServers() == 0 || activeFrameManager.getActiveFrame() == null) {
-            newServerWindowCheck.setSelected(true);
-            newServerWindowCheck.setEnabled(false);
-        } else {
-            newServerWindowCheck.setEnabled(true);
-        }
-
-        populateProfiles();
-    }
-
-    /**
-     * Adds listeners for various objects in the dialog.
-     */
-    private void addListeners() {
-        getCancelButton().addActionListener(this);
-        getOkButton().addActionListener(this);
-        editProfileButton.addActionListener(this);
-        ((VetoableComboBoxModel) identityField.getModel()).addVetoableSelectionListener(this);
-    }
-
-    /**
-     * Initialises the components in this dialog.
-     */
-    private void initComponents() {
-        serverField = new ValidatingJTextField(iconManager, new ServerNameValidator());
-        portField = new ValidatingJTextField(iconManager, new PortValidator());
-        passwordField = new JPasswordField();
-        newServerWindowCheck = new JCheckBox();
-        newServerWindowCheck.setSelected(true);
-        sslCheck = new JCheckBox();
-        identityField = new JComboBox<>(new VetoableComboBoxModel<ConfigProvider>());
-        editProfileButton = new JButton();
-
-        setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
-        orderButtons(new JButton(), new JButton());
-        setTitle("Connect to a new server");
-
-        populateProfiles();
-
-        editProfileButton.setText("Edit");
-
-        newServerWindowCheck.setText("Open in a new server window?");
-        newServerWindowCheck.setBorder(
-                BorderFactory.createEmptyBorder(0, 0, 0, 0));
-        newServerWindowCheck.setMargin(new Insets(0, 0, 0, 0));
-
-        sslCheck.setText("Use a secure (SSL) connection?");
-        sslCheck.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-        sslCheck.setMargin(new Insets(0, 0, 0, 0));
-    }
-
-    /** Populates the profiles list. */
-    public void populateProfiles() {
-        final List<ConfigProvider> profiles = identityController.getProvidersByType("profile");
-        ((DefaultComboBoxModel) identityField.getModel()).removeAllElements();
-        for (ConfigProvider profile : profiles) {
-            ((MutableComboBoxModel<ConfigProvider>) identityField.getModel()).addElement(profile);
-        }
-    }
-
-    /**
-     * Lays out the components in the dialog.
-     */
-    private void layoutComponents() {
-        getContentPane().setLayout(new MigLayout("fill"));
-
-        getContentPane().add(new JLabel("Enter the details of the server that "
-                + "you wish to connect to."), "span 3, wrap 1.5*unrel");
-        getContentPane().add(new JLabel("Server: "), "");
-        getContentPane().add(serverField, "growx, pushx, wrap");
-        getContentPane().add(new JLabel("Port: "), "");
-        getContentPane().add(portField, "growx, pushx, wrap");
-        getContentPane().add(new JLabel("Password: "), "");
-        getContentPane().add(passwordField, "growx, pushx, wrap");
-        getContentPane().add(new JLabel("Profile: "), "");
-        getContentPane().add(identityField, "split 2, growx, pushx");
-        getContentPane().add(editProfileButton, "sg button, wrap");
-        getContentPane().add(sslCheck, "skip, wrap");
-        getContentPane().add(newServerWindowCheck, "skip, wrap 1.5*unrel");
-        getContentPane().add(getLeftButton(), "split, skip, right, sg button");
-        getContentPane().add(getRightButton(), "right, sg button");
-
-        pack();
-    }
-
-    /**
-     * Saves the dialog changes.
-     */
-    private void save() {
-        if (openingServer) {
-            dispose();
-            return;
-        }
-        if (!serverField.validateText()) {
-            serverField.requestFocusInWindow();
-            return;
-        }
-        if (!portField.validateText()) {
-            portField.requestFocusInWindow();
-            return;
-        }
-
-        final String host = serverField.getText();
-        final String pass = passwordField.getText();
-        final int port = Integer.parseInt(portField.getText());
-
-        dispose();
-        openingServer = true;
-
-        final ConfigProvider profile = (ConfigProvider) identityField.getSelectedItem();
-
-        try {
-            final URI address
-                    = new URI("irc" + (sslCheck.isSelected() ? "s" : ""), pass, host, port, null,
-                            null,
-                            null);
-
-            // Open in a new window?
-            if (newServerWindowCheck.isSelected()
-                    || serverManager.numServers() == 0
-                    || activeFrameManager.getActiveFrame() == null) {
-
-                new LoggingSwingWorker<Void, Void>() {
-                    @Override
-                    protected Void doInBackground() {
-                        serverManager.connectToAddress(address, profile);
-                        return null;
-                    }
-                }.execute();
-            } else {
-                final Connection connection = activeFrameManager.getActiveFrame().getContainer().
-                        getConnection();
-
-                new LoggingSwingWorker<Void, Void>() {
-
-                    @Override
-                    protected Void doInBackground() {
-                        if (connection == null) {
-                            serverManager.connectToAddress(address, profile);
-                        } else {
-                            connection.connect(address, profile);
-                        }
-                        return null;
-                    }
-                }.execute();
-            }
-        } catch (URISyntaxException ex) {
-            Logger.userError(ErrorLevel.MEDIUM, "Unable to create URI", ex);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @param e Action event
-     */
-    @Override
-    public void actionPerformed(final ActionEvent e) {
-        if (e.getSource() == getOkButton()) {
-            save();
-        } else if (e.getSource() == editProfileButton) {
-            profileDialogProvider.displayOrRequestFocus(this);
-        } else if (e.getSource() == getCancelButton()) {
-            dispose();
-        }
-    }
-
-    @Override
-    public boolean enterPressed() {
-        executeAction(getOkButton());
-        return true;
-    }
-
-    @Override
-    public void vetoableChange(final PropertyChangeEvent e) throws PropertyVetoException {
-        if (e.getNewValue() == null) {
-            throw new PropertyVetoException("Value cannot be null", e);
-        }
-    }
-
-    @Override
-    public void configProviderAdded(final ConfigProvider configProvider) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                populateProfiles();
-            }
-        });
-    }
-
-    @Override
-    public void dispose() {
-        identityController.unregisterIdentityListener(this);
-        super.dispose();
-    }
-
-    @Override
-    public void configProviderRemoved(final ConfigProvider configProvider) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                populateProfiles();
-            }
-        });
-    }
-
-}

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

@@ -27,9 +27,9 @@ import com.dmdirc.addons.ui_swing.components.renderers.PropertyListCellRenderer;
 import com.dmdirc.addons.ui_swing.components.vetoable.VetoableListSelectionModel;
 import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
 import com.dmdirc.commandparser.aliases.Alias;
-import com.dmdirc.ui.core.aliases.AliasDialogModelAdapter;
 import com.dmdirc.interfaces.ui.AliasDialogModel;
 import com.dmdirc.ui.IconManager;
+import com.dmdirc.ui.core.aliases.AliasDialogModelAdapter;
 
 import com.google.common.base.Optional;
 

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

@@ -0,0 +1,112 @@
+/*
+ * 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.newserver;
+
+import com.dmdirc.ClientModule.GlobalConfig;
+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.injection.DialogProvider;
+import com.dmdirc.addons.ui_swing.injection.MainWindow;
+import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.interfaces.ui.NewServerDialogModel;
+import com.dmdirc.ui.IconManager;
+
+import java.awt.Window;
+
+import javax.inject.Inject;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JTextField;
+
+import net.miginfocom.swing.MigLayout;
+
+/**
+ * Dialog to connect to a new server.
+ */
+public class NewServerDialog extends StandardDialog {
+
+    private static final long serialVersionUID = 1;
+
+    @Inject
+    public NewServerDialog(@MainWindow final Window mainFrame,
+            final NewServerDialogModel model,
+            @GlobalConfig final IconManager iconManager,
+            final CommandController commandController,
+            final DialogProvider<ProfileManagerDialog> profileManagerDialog) {
+        super(mainFrame, ModalityType.DOCUMENT_MODAL);
+        final NewServerLinker linker = new NewServerLinker(model, this);
+
+        final TextLabel info = new TextLabel("Enter the details of the server you wish to "
+                + "connect to.");
+        final JTextField hostname = new JTextField();
+        final JTextField port = new JTextField();
+        final JTextField password = new JTextField();
+        final JComboBox<ConfigProvider> profiles = new JComboBox<>();
+        final JButton edit = new JButton("Edit");
+        final JCheckBox ssl = new NoBorderJCheckBox("Use a secure (SSL) connection?");
+        final JCheckBox saveAsDefault
+                = new NoBorderJCheckBox("Save these settings as the defaults?");
+
+        setResizable(false);
+
+        setTitle("New Server");
+        setLayout(new MigLayout("fill"));
+
+        add(info, "span, wrap 2*unrel");
+        add(new JLabel("Hostname: "), "align label");
+        add(ValidationFactory.getValidatorPanel(hostname, model.getHostnameValidator(),
+                iconManager), "growx, wrap");
+        add(new JLabel("Port: "), "align label");
+        add(ValidationFactory.getIntValidatorPanel(port, model.getPortValidator(), iconManager),
+                "growx, wrap");
+        add(new JLabel("Password: "), "align label");
+        add(ValidationFactory.getValidatorPanel(password, model.getPasswordValidator(),
+                iconManager), "growx, wrap");
+        add(new JLabel("Profiles: "), "align label");
+        add(ValidationFactory.getValidatorPanel(profiles, model.getProfileListValidator(),
+                iconManager), "span, split2, growx");
+        add(edit, "wrap, sg button");
+        add(ssl, "skip, grow, span, wrap");
+        add(saveAsDefault, "skip, grow, span, wrap 2*unrel");
+        add(getLeftButton(), "span, split 2, right, sg button");
+        add(getRightButton(), "right, sg button");
+
+        model.loadModel();
+        linker.bindHostname(hostname);
+        linker.bindPort(port);
+        linker.bindPassword(password);
+        linker.bindProfiles(profiles);
+        linker.bindEditProfiles(edit, profileManagerDialog);
+        linker.bindSSL(ssl);
+        linker.bindSaveAsDefault(saveAsDefault);
+        linker.bindOKButton(getOkButton());
+        linker.bindCancelButton(getCancelButton());
+    }
+
+}

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

@@ -0,0 +1,259 @@
+/*
+ * 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.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.injection.DialogProvider;
+import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.interfaces.ui.NewServerDialogModel;
+import com.dmdirc.ui.core.newserver.NewServerDialogModelAdapter;
+
+import com.google.common.base.Optional;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyVetoException;
+import java.beans.VetoableChangeListener;
+
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JTextField;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+
+/**
+ * Links the New Server Dialog with its model.
+ */
+public class NewServerLinker {
+
+    private final NewServerDialogModel model;
+    private final NewServerDialog dialog;
+
+    public NewServerLinker(final NewServerDialogModel model, final NewServerDialog dialog) {
+        this.model = model;
+        this.dialog = dialog;
+    }
+
+    public void bindHostname(final JTextField hostnameField) {
+        hostnameField.setText(model.getHostname().isPresent() ? model.getHostname().get() : "");
+        hostnameField.getDocument().addDocumentListener(new DocumentListener() {
+
+            private void update() {
+                model.setHostname(Optional.fromNullable(hostnameField.getText()));
+            }
+
+            @Override
+            public void insertUpdate(final DocumentEvent e) {
+                update();
+            }
+
+            @Override
+            public void removeUpdate(final DocumentEvent e) {
+                update();
+            }
+
+            @Override
+            public void changedUpdate(final DocumentEvent e) {
+                update();
+            }
+        });
+        model.addListener(new NewServerDialogModelAdapter() {
+
+            @Override
+            public void serverDetailsChanged(final Optional<String> hostname,
+                    final Optional<Integer> port, final Optional<String> password,
+                    final boolean ssl, final boolean saveAsDefault) {
+                if (!hostname.equals(Optional.fromNullable(hostnameField.getText()))) {
+                    hostnameField.setText(hostname.isPresent() ? hostname.get() : "");
+                }
+            }
+        });
+    }
+
+    public void bindPort(final JTextField portField) {
+        portField.setText(model.getPort().isPresent() ? Integer.toString(model.getPort().get())
+                : "");
+        portField.getDocument().addDocumentListener(new DocumentListener() {
+
+            private void update() {
+                try {
+                    model.setPort(Optional.fromNullable(Integer.valueOf(portField.getText())));
+                } catch (NumberFormatException ex) {
+                    //Do nothing, it'll have to be corrected and its handled by the validator.
+                }
+            }
+
+            @Override
+            public void insertUpdate(final DocumentEvent e) {
+                update();
+            }
+
+            @Override
+            public void removeUpdate(final DocumentEvent e) {
+                update();
+            }
+
+            @Override
+            public void changedUpdate(final DocumentEvent e) {
+                update();
+            }
+        });
+    }
+
+    public void bindPassword(final JTextField passwordField) {
+        passwordField.setText(model.getPassword().isPresent() ? model.getPassword().get() : "");
+        passwordField.getDocument().addDocumentListener(new DocumentListener() {
+
+            private void update() {
+                model.setPassword(Optional.fromNullable(passwordField.getText()));
+            }
+
+            @Override
+            public void insertUpdate(final DocumentEvent e) {
+                update();
+            }
+
+            @Override
+            public void removeUpdate(final DocumentEvent e) {
+                update();
+            }
+
+            @Override
+            public void changedUpdate(final DocumentEvent e) {
+                update();
+            }
+        });
+    }
+
+    public void bindProfiles(final JComboBox<ConfigProvider> profilesCombobox) {
+        final VetoableComboBoxModel<ConfigProvider> comboBoxModel = new VetoableComboBoxModel<>();
+        profilesCombobox.setModel(comboBoxModel);
+        profilesCombobox.setRenderer(new PropertyListCellRenderer<>(profilesCombobox.getRenderer(),
+                ConfigProvider.class, "name"));
+        for (ConfigProvider profile : model.getProfileList()) {
+            comboBoxModel.addElement(profile);
+        }
+        if (model.getSelectedProfile().isPresent()) {
+            comboBoxModel.setSelectedItem(model.getSelectedProfile().get());
+        } else if (comboBoxModel.getSize() > 0) {
+            comboBoxModel.setSelectedItem(comboBoxModel.getElementAt(0));
+        }
+        comboBoxModel.addVetoableSelectionListener(new VetoableChangeListener() {
+
+            @Override
+            public void vetoableChange(final PropertyChangeEvent evt) throws PropertyVetoException {
+                if (evt.getNewValue() == null) {
+                    throw new PropertyVetoException("Selection cannot be null", evt);
+                }
+            }
+        });
+        profilesCombobox.addItemListener(new ItemListener() {
+
+            @Override
+            public void itemStateChanged(final ItemEvent e) {
+                if (e.getStateChange() == ItemEvent.SELECTED) {
+                    model.setSelectedProfile(Optional.fromNullable((ConfigProvider) e.getItem()));
+                }
+            }
+        });
+    }
+
+    public void bindEditProfiles(final JButton edit,
+            final DialogProvider<ProfileManagerDialog> profileManagerDialog) {
+        edit.addActionListener(new ActionListener() {
+
+            @Override
+            public void actionPerformed(final ActionEvent e) {
+                profileManagerDialog.displayOrRequestFocus();
+            }
+        });
+        model.addListener(new NewServerDialogModelAdapter() {
+
+            @Override
+            public void selectedProfileChanged(Optional<ConfigProvider> oldProfile,
+                    Optional<ConfigProvider> newProfile) {
+                edit.setEnabled(model.isProfileListValid()
+                        && model.getSelectedProfile().isPresent());
+            }
+        });
+    }
+
+    public void bindSSL(final JCheckBox sslCheckbox) {
+        sslCheckbox.setSelected(model.getSSL());
+        sslCheckbox.addActionListener(new ActionListener() {
+
+            @Override
+            public void actionPerformed(final ActionEvent e) {
+                model.setSSL(sslCheckbox.isSelected());
+            }
+        });
+    }
+
+    public void bindSaveAsDefault(final JCheckBox saveAsDefaultCheckbox) {
+        saveAsDefaultCheckbox.addActionListener(new ActionListener() {
+
+            @Override
+            public void actionPerformed(final ActionEvent e) {
+                model.setSaveAsDefault(saveAsDefaultCheckbox.isSelected());
+            }
+        });
+    }
+
+    public void bindOKButton(final JButton okButton) {
+        okButton.setEnabled(model.isSaveAllowed());
+        okButton.addActionListener(new ActionListener() {
+
+            @Override
+            public void actionPerformed(final ActionEvent e) {
+                model.save();
+                dialog.dispose();
+            }
+        });
+        model.addListener(new NewServerDialogModelAdapter() {
+
+            @Override
+            public void serverDetailsChanged(final Optional<String> hostname,
+                    final Optional<Integer> port, final Optional<String> password,
+                    final boolean ssl, final boolean saveAsDefault) {
+                okButton.setEnabled(model.isSaveAllowed());
+            }
+        });
+    }
+
+    public void bindCancelButton(final JButton cancelButton) {
+        cancelButton.addActionListener(new ActionListener() {
+
+            @Override
+            public void actionPerformed(final ActionEvent e) {
+                dialog.dispose();
+            }
+        });
+    }
+
+}

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

@@ -95,7 +95,7 @@ public class ProfileManagerDialog extends StandardDialog {
             final IdentityFactory identityFactory,
             final IdentityController identityController,
             @GlobalConfig final IconManager iconManager) {
-        super(mainFrame, ModalityType.MODELESS);
+        super(mainFrame, ModalityType.DOCUMENT_MODAL);
         setTitle("Profile Manager");
         this.model = new ProfileManagerModel(identityController, identityFactory);
         this.controller = new ProfileManagerController(this, model, identityFactory);

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

@@ -29,19 +29,18 @@ import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.dialogs.FeedbackDialog;
-import com.dmdirc.addons.ui_swing.dialogs.NewServerDialog;
 import com.dmdirc.addons.ui_swing.dialogs.about.AboutDialog;
 import com.dmdirc.addons.ui_swing.dialogs.actionsmanager.ActionsManagerDialog;
+import com.dmdirc.addons.ui_swing.dialogs.aliases.AliasManagerDialog;
 import com.dmdirc.addons.ui_swing.dialogs.channellist.ChannelListDialog;
 import com.dmdirc.addons.ui_swing.dialogs.channelsetting.ChannelSettingsDialog;
 import com.dmdirc.addons.ui_swing.dialogs.error.ErrorListDialog;
-import com.dmdirc.addons.ui_swing.dialogs.aliases.AliasManagerDialog;
+import com.dmdirc.addons.ui_swing.dialogs.newserver.NewServerDialog;
 import com.dmdirc.addons.ui_swing.dialogs.prefs.SwingPreferencesDialog;
 import com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog;
 import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
 import com.dmdirc.addons.ui_swing.dialogs.updater.SwingRestartDialog;
 import com.dmdirc.addons.ui_swing.dialogs.updater.SwingUpdaterDialog;
-import com.dmdirc.ui.core.aliases.CoreAliasDialogModel;
 import com.dmdirc.config.prefs.PreferencesManager;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
@@ -49,7 +48,10 @@ import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.interfaces.ui.AliasDialogModel;
+import com.dmdirc.interfaces.ui.NewServerDialogModel;
 import com.dmdirc.plugins.ServiceManager;
+import com.dmdirc.ui.core.aliases.CoreAliasDialogModel;
+import com.dmdirc.ui.core.newserver.CoreNewServerDialogModel;
 
 import java.awt.Window;
 import java.awt.datatransfer.Clipboard;
@@ -86,6 +88,11 @@ public class DialogModule {
         return model;
     }
 
+    @Provides
+    public NewServerDialogModel getNewServerDialogModel(final CoreNewServerDialogModel model) {
+        return model;
+    }
+
     @Provides
     @Singleton
     public DialogProvider<NewServerDialog> getNewServerDialogProvider(