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

added handlers for create table + adjusted connection code to better handle failed connections

Browse source
This commit is contained in:
betasteward 2015-06-08 14:05:00 -04:00
parent 71c7bc38e1
commit c47da1f5b3
31 changed files with 542 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -788,7 +788,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
if (connect(connection)) {
return true;
} else {
showMessage("Unable to connect to server");
showMessage("Error Connecting", "Unable to connect to server");
}
} finally {
setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
@ -974,7 +974,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
client.disconnect(false);
tablesPane.clearChat();
setWindowTitle();
showMessage("You have disconnected");
showMessage("Disconnected", "You have disconnected");
}
} else {
connectDialog.showDialog();
@ -1357,27 +1357,27 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
// }
}
public void showMessage(final String message) {
public void showMessage(final String title, final String message) {
if (SwingUtilities.isEventDispatchThread()) {
JOptionPane.showMessageDialog(desktopPane, message);
JOptionPane.showMessageDialog(desktopPane, message, title, JOptionPane.INFORMATION_MESSAGE);
} else {
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
JOptionPane.showMessageDialog(desktopPane, message);
JOptionPane.showMessageDialog(desktopPane, message, title, JOptionPane.INFORMATION_MESSAGE);
}
});
}
}
public void showError(final String message) {
public void showError(final String title, final String message) {
if (SwingUtilities.isEventDispatchThread()) {
JOptionPane.showMessageDialog(desktopPane, message, "Error", JOptionPane.ERROR_MESSAGE);
JOptionPane.showMessageDialog(desktopPane, message, title, JOptionPane.ERROR_MESSAGE);
} else {
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
JOptionPane.showMessageDialog(desktopPane, message, "Error", JOptionPane.ERROR_MESSAGE);
JOptionPane.showMessageDialog(desktopPane, message, title, JOptionPane.ERROR_MESSAGE);
}
});
}
@ -1389,12 +1389,12 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
// }
@Override
public void inform(String message, MessageType type) {
public void inform(String title, String message, MessageType type) {
if (type == MessageType.ERROR) {
showError(message);
showError(title, message);
}
else {
showMessage(message);
showMessage(title, message);
}
}

2
Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java
View file

@ -507,6 +507,6 @@ public class CallbackClientImpl implements CallbackClient {
private void handleException(Exception ex) {
logger.fatal("Client error\n", ex);
frame.showError("Error: " + ex.getMessage());
// frame.showError("Error: " + ex.getMessage());
}
}

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

@ -94,7 +94,7 @@ public class MultiConnectTest {
// }
@Override
public void inform(String message, MessageType type) {
public void inform(String title, String message, MessageType type) {
if (type == MessageType.ERROR) {
showError(message);
}