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

Fixed Issue#122: Check of deck and game type during creating a new table doesn't show a qualified error message

Browse source
This commit is contained in:
magenoxx 2013-01-21 21:14:22 +04:00
parent 2b6e87885a
commit 2c652770fb
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java
View file

@ -398,7 +398,8 @@ public class NewTableDialog extends MageDialog {
private void handleError(Exception ex) { private void handleError(Exception ex) {
logger.fatal("Error loading deck", ex); logger.fatal("Error loading deck", ex);
JOptionPane.showMessageDialog(MageFrame.getDesktop(), "Error loading deck.", "Error", JOptionPane.ERROR_MESSAGE); //JOptionPane.showMessageDialog(MageFrame.getDesktop(), "Error loading deck.", "Error", JOptionPane.ERROR_MESSAGE);
MageFrame.getInstance().showErrorDialog("Error loading deck.", ex.getMessage());
} }
public void showDialog(UUID roomId) { public void showDialog(UUID roomId) {

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

@ -30,6 +30,7 @@ package mage.remote;
import mage.MageException; import mage.MageException;
import mage.cards.decks.DeckCardLists; import mage.cards.decks.DeckCardLists;
import mage.cards.decks.InvalidDeckException;
import mage.constants.Constants.SessionState; import mage.constants.Constants.SessionState;
import mage.game.GameException; import mage.game.GameException;
import mage.game.match.MatchOptions; import mage.game.match.MatchOptions;
@ -404,6 +405,8 @@ public class SessionImpl implements Session {
try { try {
if (isConnected()) if (isConnected())
return server.joinTable(sessionId, roomId, tableId, playerName, playerType, skill, deckList); return server.joinTable(sessionId, roomId, tableId, playerName, playerType, skill, deckList);
} catch (InvalidDeckException iex) {
handleInvalidDeckException(iex);
} catch (GameException ex) { } catch (GameException ex) {
handleGameException(ex); handleGameException(ex);
} catch (MageException ex) { } catch (MageException ex) {
@ -1057,6 +1060,12 @@ public class SessionImpl implements Session {
private void handleMageException(MageException ex) { private void handleMageException(MageException ex) {
logger.fatal("Server error", ex); logger.fatal("Server error", ex);
client.showError(ex.getMessage());
}
private void handleInvalidDeckException(InvalidDeckException iex) {
logger.warn(iex.getMessage() + "\n" + iex.getInvalid());
client.showError(iex.getMessage() + "\n" + iex.getInvalid());
} }
private void handleGameException(GameException ex) { private void handleGameException(GameException ex) {