External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 04:22:01 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

handle reconnects

Browse source
This commit is contained in:
betasteward 2015-05-27 20:44:18 -04:00
parent 2143e87543
commit a168d53966
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -327,7 +327,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
enableButtons();
} else {
connectDialog.showDialog();
if (client.isConnected()) {
if (client != null && client.isConnected()) {
showGames(false);
}
}
@ -698,6 +698,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
}
public boolean connect(Connection connection) {
client = new Client(instance);
boolean result = client.connect(connection.getUsername(), connection.getHost(), connection.getPort(), version);
return result;
}
@ -928,7 +929,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
}//GEN-LAST:event_btnExitActionPerformed
private void btnConnectActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnConnectActionPerformed
if (client.isConnected()) {
if (client != null && client.isConnected()) {
if (JOptionPane.showConfirmDialog(this, "Are you sure you want to disconnect?", "Confirm disconnect", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) {
client.disconnect(false);
tablesPane.clearChat();
@ -937,7 +938,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
}
} else {
connectDialog.showDialog();
if (client.isConnected()) {
if (client != null && client.isConnected()) {
showGames(false);
}
}
@ -965,7 +966,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
}//GEN-LAST:event_btnPreferencesActionPerformed
public void btnSendFeedbackActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnSendFeedbackActionPerformed
if (!client.isConnected()) {
if (client == null || !client.isConnected()) {
JOptionPane.showMessageDialog(null, "You may send us feedback only when connected to server.", "Information", JOptionPane.INFORMATION_MESSAGE);
return;
}
@ -973,7 +974,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
}//GEN-LAST:event_btnSendFeedbackActionPerformed
public void exitApp() {
if (client.isConnected()) {
if (client != null && client.isConnected()) {
if (JOptionPane.showConfirmDialog(this, "You are currently connected. Are you sure you want to disconnect?", "Confirm disconnect", JOptionPane.YES_NO_OPTION) != JOptionPane.YES_OPTION) {
return;
}
@ -1188,7 +1189,6 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
}
}
instance = new MageFrame();
client = new Client(instance);
instance.setVisible(true);
}

1
Mage.Network/src/main/java/org/mage/network/Client.java
View file

@ -39,7 +39,6 @@ import org.mage.network.handlers.client.InformClientMessageHandler;
import org.mage.network.handlers.client.ServerMessageHandler;
import org.mage.network.interfaces.MageClient;
import org.mage.network.model.MessageType;
import org.mage.network.model.RegisterClientMessage;
/**
*