From f5765383c7c08db9da3f0b5c80af51cf5e70fd69 Mon Sep 17 00:00:00 2001
From: Me Car <menoc4r@gmail.com>
Date: Thu, 14 Jan 2016 10:01:30 +0900
Subject: [PATCH] Use server and port specified in ConnectDialog rather than in
 the preference.

---
 .../main/java/mage/client/dialog/ConnectDialog.java  | 12 ++++++++++--
 .../java/mage/client/dialog/RegisterUserDialog.java  |  8 +++++---
 .../java/mage/client/dialog/ResetPasswordDialog.java |  8 +++++---
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java b/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java
index 50ea1cc30fb..6a07009d62d 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java
+++ b/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java
@@ -97,10 +97,10 @@ public class ConnectDialog extends MageDialog {
         this.txtUserName.addActionListener(connectAction);
         this.txtPassword.addActionListener(connectAction);
 
-        registerUserDialog = new RegisterUserDialog();
+        registerUserDialog = new RegisterUserDialog(this);
         MageFrame.getDesktop().add(registerUserDialog, JLayeredPane.POPUP_LAYER);
 
-        resetPasswordDialog = new ResetPasswordDialog();
+        resetPasswordDialog = new ResetPasswordDialog(this);
         MageFrame.getDesktop().add(resetPasswordDialog, JLayeredPane.POPUP_LAYER);
     }
 
@@ -587,6 +587,14 @@ public class ConnectDialog extends MageDialog {
         resetPasswordDialog.showDialog();
     }//GEN-LAST:event_btnForgotPasswordActionPerformed
 
+    public String getServer() {
+        return this.txtServer.getText();
+    }
+
+    public String getPort() {
+        return this.txtPort.getText();
+    }
+
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JButton btnCancel;
     private javax.swing.JButton btnConnect;
diff --git a/Mage.Client/src/main/java/mage/client/dialog/RegisterUserDialog.java b/Mage.Client/src/main/java/mage/client/dialog/RegisterUserDialog.java
index c7c132a14c6..59886d5721d 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/RegisterUserDialog.java
+++ b/Mage.Client/src/main/java/mage/client/dialog/RegisterUserDialog.java
@@ -15,6 +15,7 @@ import org.apache.log4j.Logger;
 public class RegisterUserDialog extends MageDialog {
 
     private static final Logger logger = Logger.getLogger(ConnectDialog.class);
+    private ConnectDialog connectDialog;
     private Connection connection;
     private ConnectTask task;
     private Session session;
@@ -22,13 +23,14 @@ public class RegisterUserDialog extends MageDialog {
     /**
      * Creates new form RegisterUserDialog
      */
-    public RegisterUserDialog() {
+    public RegisterUserDialog(ConnectDialog connectDialog) {
         initComponents();
+        this.connectDialog = connectDialog;
     }
 
     public void showDialog() {
-        this.txtServer.setText(MageFrame.getPreferences().get("serverAddress", Config.serverName));
-        this.txtPort.setText(MageFrame.getPreferences().get("serverPort", Integer.toString(Config.port)));
+        this.txtServer.setText(this.connectDialog.getServer());
+        this.txtPort.setText(this.connectDialog.getPort());
         this.lblStatus.setText("");
 
         this.setModal(true);
diff --git a/Mage.Client/src/main/java/mage/client/dialog/ResetPasswordDialog.java b/Mage.Client/src/main/java/mage/client/dialog/ResetPasswordDialog.java
index 1328ec25045..edab801a7df 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/ResetPasswordDialog.java
+++ b/Mage.Client/src/main/java/mage/client/dialog/ResetPasswordDialog.java
@@ -15,6 +15,7 @@ import org.apache.log4j.Logger;
 public class ResetPasswordDialog extends MageDialog {
 
     private static final Logger logger = Logger.getLogger(ResetPasswordDialog.class);
+    private ConnectDialog connectDialog;
     private Connection connection;
     private Session session;
     private GetAuthTokenTask getAuthTokenTask;
@@ -23,13 +24,14 @@ public class ResetPasswordDialog extends MageDialog {
     /**
      * Creates new form ResetPasswordDialog
      */
-    public ResetPasswordDialog() {
+    public ResetPasswordDialog(ConnectDialog connectDialog) {
         initComponents();
+        this.connectDialog = connectDialog;
     }
 
     public void showDialog() {
-        this.txtServer.setText(MageFrame.getPreferences().get("serverAddress", Config.serverName));
-        this.txtPort.setText(MageFrame.getPreferences().get("serverPort", Integer.toString(Config.port)));
+        this.txtServer.setText(this.connectDialog.getServer());
+        this.txtPort.setText(this.connectDialog.getPort());
         this.lblStatus.setText("");
 
         this.setModal(true);