External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-25 04:39:18 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Client connect - Fixed that reconnect request was also shown if no successful connection was set up before.

Browse source
This commit is contained in:
LevelX2 2014-09-25 23:13:05 +02:00
parent 7e9accb0fd
commit 2c63d3bff8
6 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Common/src/mage/interfaces/MageClient.java
View file

@ -39,7 +39,7 @@ public interface MageClient extends CallbackClient {
MageVersion getVersion();
void connected(String message);
void disconnected();
void disconnected(boolean errorCall);
void showMessage(String message);
void showError(String message);

10
Mage.Common/src/mage/remote/SessionImpl.java
View file

@ -34,6 +34,7 @@ import java.net.MalformedURLException;
import java.net.PasswordAuthentication;
import java.net.SocketException;
import java.net.SocketTimeoutException;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedList;
@ -310,7 +311,12 @@ public class SessionImpl implements Session {
logger.fatal("Unable to connect to server - ", t);
if (!canceled) {
disconnect(false);
client.showMessage("Unable to connect to server. " + t.getMessage());
StringBuilder sb = new StringBuilder();
sb.append("Unable to connect to server.\n");
for (StackTraceElement element :t.getStackTrace()) {
sb.append(element.toString()).append("\n");
}
client.showMessage(sb.toString());
}
}
return false;
@ -368,7 +374,7 @@ public class SessionImpl implements Session {
if (sessionState == SessionState.DISCONNECTING || sessionState == SessionState.CONNECTING) {
sessionState = SessionState.DISCONNECTED;
logger.info("Disconnected ... ");
client.disconnected();
client.disconnected(errorCall);
if (errorCall) {
client.showError("Network error. You have been disconnected");
}