From 0c63fc04b41cb8779594fecb996f7e104b73b867 Mon Sep 17 00:00:00 2001 From: spjspj Date: Sat, 27 Jan 2018 01:52:31 +1100 Subject: [PATCH 1/2] Update connection dialog to point to Xmage.us from xmage.woogerworks.com --- .../java/mage/client/dialog/ConnectDialog.form | 8 ++++---- .../java/mage/client/dialog/ConnectDialog.java | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.form b/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.form index 1202ae50be..fdc0887453 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.form +++ b/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.form @@ -341,19 +341,19 @@ - - + + - + - + 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 867698822d..02fb0f7c42 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java @@ -300,15 +300,15 @@ public class ConnectDialog extends MageDialog { btnFind3.setIcon(new javax.swing.ImageIcon(getClass().getResource("/flags/us.png"))); // NOI18N btnFind3.setText("W"); - btnFind3.setToolTipText("Connect to Woogerworks (USA)"); - btnFind3.setActionCommand("connectWoogerworks"); + btnFind3.setToolTipText("Connect to Xmage.us (USA)"); + btnFind3.setActionCommand("connectXmageus"); btnFind3.setAlignmentY(0.0F); btnFind3.setMargin(new java.awt.Insets(2, 2, 2, 2)); - btnFind3.setName("connectWoogerworksBtn"); // NOI18N + btnFind3.setName("connectXmageusBtn"); // NOI18N btnFind3.setPreferredSize(new java.awt.Dimension(23, 23)); btnFind3.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { - connectWoogerworks(evt); + connectXmageus(evt); } }); @@ -723,14 +723,14 @@ public class ConnectDialog extends MageDialog { }//GEN-LAST:event_btnFind2findPublicServerActionPerformed - private void connectWoogerworks(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_connectWoogerworks - String serverAddress = "xmage.woogerworks.com"; + private void connectXmageus(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_connecXmageusW + String serverAddress = "xmage.us"; this.txtServer.setText(serverAddress); this.txtPort.setText("17171"); // Update userName and password according to the chosen server. this.txtUserName.setText(MagePreferences.getUserName(serverAddress)); this.txtPassword.setText(MagePreferences.getPassword(serverAddress)); - }//GEN-LAST:event_connectWoogerworks + }//GEN-LAST:event_connectXmageus private void btnFlagSearchActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnFlagSearchActionPerformed doFastFlagSearch(); From 71a1097b1c1c91f45d7a6c4e892e4602b25552a5 Mon Sep 17 00:00:00 2001 From: spjspj Date: Sat, 27 Jan 2018 11:28:46 +1100 Subject: [PATCH 2/2] Update connection dialog to point to Xmage.us from xmage.woogerworks.com --- .../src/main/java/mage/client/dialog/ConnectDialog.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 02fb0f7c42..5a613389dc 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java @@ -299,8 +299,8 @@ public class ConnectDialog extends MageDialog { }); btnFind3.setIcon(new javax.swing.ImageIcon(getClass().getResource("/flags/us.png"))); // NOI18N - btnFind3.setText("W"); - btnFind3.setToolTipText("Connect to Xmage.us (USA)"); + btnFind3.setText("U"); + btnFind3.setToolTipText("Connect to xmage.us (USA)"); btnFind3.setActionCommand("connectXmageus"); btnFind3.setAlignmentY(0.0F); btnFind3.setMargin(new java.awt.Insets(2, 2, 2, 2));