Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

added client proxy settings + other fixes

Browse source
This commit is contained in:
BetaSteward 2011-05-05 23:06:19 -04:00
parent ddeb0de911
commit 1fef6e6bb4
7 changed files with 263 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Mage.Client/src/main/java/mage/client/MageFrame.java
View file

@ -464,15 +464,22 @@ public class MageFrame extends javax.swing.JFrame {
return session.connect(userName, serverName, port);
}
public static boolean connect(String userName, String serverName, int port, String proxyServer, int proxyPort) {
return session.connect(userName, serverName, port, proxyServer, proxyPort);
}
public boolean autoConnect() {
boolean autoConnect = Boolean.parseBoolean(prefs.get("autoConnect", "false"));
if (autoConnect) {
String userName = prefs.get("userName", "");
String server = prefs.get("serverAddress", "");
int port = Integer.parseInt(prefs.get("serverPort", ""));
String proxyServer = prefs.get("proxyAddress", "");
int proxyPort = Integer.parseInt(prefs.get("proxyPort", ""));
boolean useProxy = Boolean.parseBoolean(prefs.get("useProxy", "false"));
try {
setCursor(new Cursor(Cursor.WAIT_CURSOR));
if (MageFrame.connect(userName, server, port)) {
if (MageFrame.connect(userName, server, port, useProxy?proxyServer:"", useProxy?proxyPort:0)) {
return true;
} else {
JOptionPane.showMessageDialog(rootPane, "Unable to connect to server");