Merge pull request #254 from 2xsaiko/patch-1

Improve connect/create server dialogs

4 files changed, 234 insertions, 90 deletions

diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/AbstractDialog.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/AbstractDialog.java
new file mode 100644
index 00000000..b179eac1
--- /dev/null
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/AbstractDialog.java
@@ -0,0 +1,89 @@
+package cuchaz.enigma.gui.dialog;
+
+import java.awt.*;
+import java.util.List;
+
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+
+import cuchaz.enigma.gui.util.ScaleUtil;
+import cuchaz.enigma.utils.I18n;
+import cuchaz.enigma.utils.Pair;
+import cuchaz.enigma.utils.validation.ValidationContext;
+
+public abstract class AbstractDialog extends JDialog {
+
+        protected final ValidationContext vc = new ValidationContext();
+
+        private boolean actionConfirm = false;
+
+        public AbstractDialog(Frame owner, String title, String confirmAction, String cancelAction) {
+                super(owner, I18n.translate(title), true);
+
+                Container contentPane = getContentPane();
+                contentPane.setLayout(new BorderLayout());
+                Container inputContainer = new JPanel(new GridBagLayout());
+                GridBagConstraints c = new GridBagConstraints();
+
+                List<Pair<String, Component>> components = createComponents();
+
+                for (int i = 0; i < components.size(); i += 1) {
+                        Pair<String, Component> entry = components.get(i);
+                        JLabel label = new JLabel(I18n.translate(entry.a));
+                        Component component = entry.b;
+
+                        c.gridy = i;
+                        c.insets = ScaleUtil.getInsets(4, 4, 4, 4);
+
+                        c.gridx = 0;
+                        c.weightx = 0.0;
+                        c.anchor = GridBagConstraints.LINE_END;
+                        c.fill = GridBagConstraints.NONE;
+                        inputContainer.add(label, c);
+
+                        c.gridx = 1;
+                        c.weightx = 1.0;
+                        c.anchor = GridBagConstraints.LINE_START;
+                        c.fill = GridBagConstraints.HORIZONTAL;
+                        inputContainer.add(component, c);
+                }
+                contentPane.add(inputContainer, BorderLayout.CENTER);
+                Container buttonContainer = new JPanel(new FlowLayout(FlowLayout.RIGHT, ScaleUtil.scale(4), ScaleUtil.scale(4)));
+                JButton connectButton = new JButton(I18n.translate(confirmAction));
+                connectButton.addActionListener(event -> confirm());
+                buttonContainer.add(connectButton);
+                JButton abortButton = new JButton(I18n.translate(cancelAction));
+                abortButton.addActionListener(event -> cancel());
+                buttonContainer.add(abortButton);
+                contentPane.add(buttonContainer, BorderLayout.SOUTH);
+
+                pack();
+                setLocationRelativeTo(owner);
+        }
+
+        protected abstract List<Pair<String, Component>> createComponents();
+
+        protected void confirm() {
+                vc.reset();
+                validateInputs();
+                if (vc.canProceed()) {
+                        actionConfirm = true;
+                        setVisible(false);
+                }
+        }
+
+        protected void cancel() {
+                actionConfirm = false;
+                setVisible(false);
+        }
+
+        public boolean isActionConfirm() {
+                return actionConfirm;
+        }
+
+        public void validateInputs() {
+        }
+
+}
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/ConnectToServerDialog.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/ConnectToServerDialog.java
index c5f505cf..f23007a0 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/ConnectToServerDialog.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/ConnectToServerDialog.java
@@ -1,64 +1,93 @@
 package cuchaz.enigma.gui.dialog;
 
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
+import javax.swing.JPasswordField;
+import javax.swing.JTextField;
+
+import cuchaz.enigma.gui.elements.ValidatableTextField;
+import cuchaz.enigma.gui.util.ScaleUtil;
 import cuchaz.enigma.network.EnigmaServer;
-import cuchaz.enigma.utils.I18n;
+import cuchaz.enigma.network.ServerAddress;
+import cuchaz.enigma.utils.Pair;
+import cuchaz.enigma.utils.validation.Message;
+import cuchaz.enigma.utils.validation.StandardValidation;
 
-import javax.swing.*;
-import java.awt.Frame;
+public class ConnectToServerDialog extends AbstractDialog {
 
-public class ConnectToServerDialog {
-
-        public static Result show(Frame parentComponent) {
-                JTextField usernameField = new JTextField(System.getProperty("user.name"), 20);
-                JPanel usernameRow = new JPanel();
-                usernameRow.add(new JLabel(I18n.translate("prompt.connect.username")));
-                usernameRow.add(usernameField);
-                JTextField ipField = new JTextField(20);
-                JPanel ipRow = new JPanel();
-                ipRow.add(new JLabel(I18n.translate("prompt.connect.ip")));
-                ipRow.add(ipField);
-                JTextField portField = new JTextField(String.valueOf(EnigmaServer.DEFAULT_PORT), 10);
-                JPanel portRow = new JPanel();
-                portRow.add(new JLabel(I18n.translate("prompt.port")));
-                portRow.add(portField);
-                JPasswordField passwordField = new JPasswordField(20);
-                JPanel passwordRow = new JPanel();
-                passwordRow.add(new JLabel(I18n.translate("prompt.password")));
-                passwordRow.add(passwordField);
-
-                int response = JOptionPane.showConfirmDialog(parentComponent, new Object[]{usernameRow, ipRow, portRow, passwordRow}, I18n.translate("prompt.connect.title"), JOptionPane.OK_CANCEL_OPTION);
-                if (response != JOptionPane.OK_OPTION) {
-                        return null;
-                }
+        private JTextField usernameField;
+        private ValidatableTextField ipField;
+        private JPasswordField passwordField;
 
-                String username = usernameField.getText();
-                String ip = ipField.getText();
-                int port;
-                try {
-                        port = Integer.parseInt(portField.getText());
-                } catch (NumberFormatException e) {
-                        JOptionPane.showMessageDialog(parentComponent, I18n.translate("prompt.port.nan"), I18n.translate("prompt.connect.title"), JOptionPane.ERROR_MESSAGE);
-                        return null;
-                }
-                if (port < 0 || port >= 65536) {
-                        JOptionPane.showMessageDialog(parentComponent, I18n.translate("prompt.port.invalid"), I18n.translate("prompt.connect.title"), JOptionPane.ERROR_MESSAGE);
-                        return null;
+        public ConnectToServerDialog(Frame owner) {
+                super(owner, "prompt.connect.title", "prompt.connect.confirm", "prompt.cancel");
+
+                Dimension preferredSize = getPreferredSize();
+                preferredSize.width = ScaleUtil.scale(400);
+                setPreferredSize(preferredSize);
+                pack();
+                setLocationRelativeTo(owner);
+        }
+
+        @Override
+        protected List<Pair<String, Component>> createComponents() {
+                usernameField = new JTextField(System.getProperty("user.name"));
+                ipField = new ValidatableTextField();
+                passwordField = new JPasswordField();
+
+                usernameField.addActionListener(event -> confirm());
+                ipField.addActionListener(event -> confirm());
+                passwordField.addActionListener(event -> confirm());
+
+                return Arrays.asList(
+                                new Pair<>("prompt.connect.username", usernameField),
+                                new Pair<>("prompt.connect.address", ipField),
+                                new Pair<>("prompt.password", passwordField)
+                );
+        }
+
+        public void validateInputs() {
+                vc.setActiveElement(ipField);
+                if (StandardValidation.notBlank(vc, ipField.getText())) {
+                        vc.raise(Message.INVALID_IP);
                 }
-                char[] password = passwordField.getPassword();
+        }
+
+        public Result getResult() {
+                if (!isActionConfirm()) return null;
+                vc.reset();
+                validateInputs();
+                if (!vc.canProceed()) return null;
+                return new Result(
+                                usernameField.getText(),
+                                Objects.requireNonNull(ServerAddress.from(ipField.getText(), EnigmaServer.DEFAULT_PORT)),
+                                passwordField.getPassword()
+                );
+        }
+
+        public static Result show(Frame parent) {
+                ConnectToServerDialog d = new ConnectToServerDialog(parent);
+
+                d.setVisible(true);
+                Result r = d.getResult();
 
-                return new Result(username, ip, port, password);
+                d.dispose();
+                return r;
         }
 
         public static class Result {
                 private final String username;
-                private final String ip;
-                private final int port;
+                private final ServerAddress address;
                 private final char[] password;
 
-                public Result(String username, String ip, int port, char[] password) {
+                public Result(String username, ServerAddress address, char[] password) {
                         this.username = username;
-                        this.ip = ip;
-                        this.port = port;
+                        this.address = address;
                         this.password = password;
                 }
 
@@ -66,12 +95,8 @@ public class ConnectToServerDialog {
                         return username;
                 }
 
-                public String getIp() {
-                        return ip;
-                }
-
-                public int getPort() {
-                        return port;
+                public ServerAddress getAddress() {
+                        return address;
                 }
 
                 public char[] getPassword() {
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/CreateServerDialog.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/CreateServerDialog.java
index eea1dff1..ddd3bc37 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/CreateServerDialog.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/CreateServerDialog.java
@@ -1,47 +1,77 @@
 package cuchaz.enigma.gui.dialog;
 
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.util.Arrays;
+import java.util.List;
+
+import cuchaz.enigma.gui.elements.ValidatablePasswordField;
+import cuchaz.enigma.gui.elements.ValidatableTextField;
+import cuchaz.enigma.gui.util.ScaleUtil;
 import cuchaz.enigma.network.EnigmaServer;
-import cuchaz.enigma.utils.I18n;
-
-import javax.swing.*;
-import java.awt.*;
-
-public class CreateServerDialog {
-
-        public static Result show(Frame parentComponent) {
-                JTextField portField = new JTextField(String.valueOf(EnigmaServer.DEFAULT_PORT), 10);
-                JPanel portRow = new JPanel();
-                portRow.add(new JLabel(I18n.translate("prompt.port")));
-                portRow.add(portField);
-                JPasswordField passwordField = new JPasswordField(20);
-                JPanel passwordRow = new JPanel();
-                passwordRow.add(new JLabel(I18n.translate("prompt.password")));
-                passwordRow.add(passwordField);
-
-                int response = JOptionPane.showConfirmDialog(parentComponent, new Object[]{portRow, passwordRow}, I18n.translate("prompt.create_server.title"), JOptionPane.OK_CANCEL_OPTION);
-                if (response != JOptionPane.OK_OPTION) {
-                        return null;
-                }
+import cuchaz.enigma.utils.Pair;
+import cuchaz.enigma.utils.validation.Message;
+import cuchaz.enigma.utils.validation.StandardValidation;
 
-                int port;
-                try {
-                        port = Integer.parseInt(portField.getText());
-                } catch (NumberFormatException e) {
-                        JOptionPane.showMessageDialog(parentComponent, I18n.translate("prompt.port.nan"), I18n.translate("prompt.create_server.title"), JOptionPane.ERROR_MESSAGE);
-                        return null;
-                }
-                if (port < 0 || port >= 65536) {
-                        JOptionPane.showMessageDialog(parentComponent, I18n.translate("prompt.port.invalid"), I18n.translate("prompt.create_server.title"), JOptionPane.ERROR_MESSAGE);
-                        return null;
-                }
+public class CreateServerDialog extends AbstractDialog {
+
+        private ValidatableTextField portField;
+        private ValidatablePasswordField passwordField;
+
+        public CreateServerDialog(Frame owner) {
+                super(owner, "prompt.create_server.title", "prompt.create_server.confirm", "prompt.cancel");
+
+                Dimension preferredSize = getPreferredSize();
+                preferredSize.width = ScaleUtil.scale(400);
+                setPreferredSize(preferredSize);
+                pack();
+                setLocationRelativeTo(owner);
+        }
+
+        @Override
+        protected List<Pair<String, Component>> createComponents() {
+                portField = new ValidatableTextField(Integer.toString(EnigmaServer.DEFAULT_PORT));
+                passwordField = new ValidatablePasswordField();
 
-                char[] password = passwordField.getPassword();
-                if (password.length > EnigmaServer.MAX_PASSWORD_LENGTH) {
-                        JOptionPane.showMessageDialog(parentComponent, I18n.translate("prompt.password.too_long"), I18n.translate("prompt.create_server.title"), JOptionPane.ERROR_MESSAGE);
-                        return null;
+                portField.addActionListener(event -> confirm());
+                passwordField.addActionListener(event -> confirm());
+
+                return Arrays.asList(
+                                new Pair<>("prompt.create_server.port", portField),
+                                new Pair<>("prompt.password", passwordField)
+                );
+        }
+
+        @Override
+        public void validateInputs() {
+                vc.setActiveElement(portField);
+                StandardValidation.isIntInRange(vc, portField.getText(), 0, 65535);
+                vc.setActiveElement(passwordField);
+                if (passwordField.getPassword().length > EnigmaServer.MAX_PASSWORD_LENGTH) {
+                        vc.raise(Message.FIELD_LENGTH_OUT_OF_RANGE, EnigmaServer.MAX_PASSWORD_LENGTH);
                 }
+        }
+
+        public Result getResult() {
+                if (!isActionConfirm()) return null;
+                vc.reset();
+                validateInputs();
+                if (!vc.canProceed()) return null;
+                return new Result(
+                                Integer.parseInt(portField.getText()),
+                                passwordField.getPassword()
+                );
+        }
+
+        public static Result show(Frame parent) {
+                CreateServerDialog d = new CreateServerDialog(parent);
+
+                d.setVisible(true);
+                Result r = d.getResult();
 
-                return new Result(port, password);
+                d.dispose();
+                return r;
         }
 
         public static class Result {
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
index 3378d1a4..1481a9dc 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
@@ -227,7 +227,7 @@ public class MenuBar {
                 }
                 this.gui.getController().disconnectIfConnected(null);
                 try {
-                        this.gui.getController().createClient(result.getUsername(), result.getIp(), result.getPort(), result.getPassword());
+                        this.gui.getController().createClient(result.getUsername(), result.getAddress().address, result.getAddress().port, result.getPassword());
                 } catch (IOException e) {
                         JOptionPane.showMessageDialog(this.gui.getFrame(), e.toString(), I18n.translate("menu.collab.connect.error"), JOptionPane.ERROR_MESSAGE);
                         this.gui.getController().disconnectIfConnected(null);