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

more client fixes

Browse source
This commit is contained in:
BetaSteward 2011-06-02 23:09:21 -04:00
parent 3ef090b6f5
commit d6e239586b
5 changed files with 54 additions and 42 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

@ -733,7 +733,8 @@ public class MageFrame extends javax.swing.JFrame implements Client {
private void btnConnectActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnConnectActionPerformed
if (session.getState() == SessionState.CONNECTED) {
if (JOptionPane.showConfirmDialog(this, "Are you sure you want to disconnect?", "Confirm disconnect", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) {
session.disconnect(true);
session.disconnect(false);
showMessage("You have disconnected");
}
} else {
connectDialog.showDialog();
@ -747,7 +748,7 @@ public class MageFrame extends javax.swing.JFrame implements Client {
}//GEN-LAST:event_btnAboutActionPerformed
public void exitApp() {
session.disconnect(true);
session.disconnect(false);
Plugins.getInstance().shutdown();
dispose();
System.exit(0);
@ -915,12 +916,12 @@ public class MageFrame extends javax.swing.JFrame implements Client {
@Override
public void showMessage(String message) {
JOptionPane.showMessageDialog(desktopPane, message);
JOptionPane.showMessageDialog(this, message);
}
@Override
public void showError(String message) {
JOptionPane.showMessageDialog(desktopPane, message, "Error", JOptionPane.ERROR_MESSAGE);
JOptionPane.showMessageDialog(this, message, "Error", JOptionPane.ERROR_MESSAGE);
}
@Override

3
Mage.Client/src/main/java/mage/client/chat/ChatPanel.java
View file

@ -80,7 +80,8 @@ public class ChatPanel extends javax.swing.JPanel {
}
public void disconnect() {
session.leaveChat(chatId);
if (session != null)
session.leaveChat(chatId);
}
public void receiveMessage(String message, MessageColor color) {