External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-23 03:39:54 -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

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

@ -1224,7 +1224,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
}
@Override
public void disconnected() {
public void disconnected(final boolean errorCall) {
if (SwingUtilities.isEventDispatchThread()) {
setStatusText("Not connected");
disableButtons();
@ -1238,13 +1238,10 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
disableButtons();
hideGames();
hideTables();
if (JOptionPane.showConfirmDialog(MageFrame.this, "The connection to server was lost. Reconnect?", "Warning", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) {
// session.disconnect(false);
// tablesPane.clearChat();
if (errorCall && JOptionPane.showConfirmDialog(MageFrame.this, "The connection to server was lost. Reconnect?", "Warning", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) {
if (performConnect()) {
enableButtons();
}
// } else {
}
}
});

4
Mage.Client/src/test/java/mage/client/game/MultiConnectTest.java
View file

@ -70,7 +70,7 @@ public class MultiConnectTest {
}
@Override
public void disconnected() {
public void disconnected(boolean errorCall) {
logger.info("disconnected");
}
@ -106,11 +106,13 @@ public class MultiConnectTest {
private void connect(final int index) throws Exception {
Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
@Override
public void uncaughtException(Thread t, Throwable e) {
logger.fatal(null, e);
}
});
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
String username = "player" + index;
ClientMock client = new ClientMock(username);