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

big client update - moved Session to Mage.Common project, this will allow other clients to reuse connection logic

Browse source
This commit is contained in:
BetaSteward 2011-05-31 23:01:07 -04:00
parent b9f4f7abf4
commit 8b1c463d35
80 changed files with 417 additions and 610 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -46,7 +46,8 @@ import mage.client.constants.Constants.DeckEditorMode;
import mage.client.deckeditor.collection.viewer.CollectionViewerPane;
import mage.client.dialog.*;
import mage.client.plugins.impl.Plugins;
import mage.client.remote.Session;
import mage.interfaces.callback.ClientCallback;
import mage.remote.Session;
import mage.client.util.EDTExceptionHandler;
import mage.client.util.gui.ArrowBuilder;
import mage.components.ImagePanel;
@ -72,13 +73,21 @@ import java.util.List;
import java.util.prefs.Preferences;
import javax.swing.event.PopupMenuEvent;
import javax.swing.event.PopupMenuListener;
import mage.client.chat.ChatPanel;
import mage.client.components.MageUI;
import mage.client.deckeditor.DeckEditorPane;
import mage.client.draft.DraftPane;
import mage.client.draft.DraftPanel;
import mage.client.game.GamePane;
import mage.client.remote.Session.SessionState;
import mage.client.game.GamePanel;
import mage.client.remote.CallbackClientImpl;
import mage.client.table.TablesPane;
import mage.client.tournament.TournamentPane;
import mage.client.tournament.TournamentPanel;
import mage.constants.Constants.SessionState;
import mage.game.match.MatchOptions;
import mage.interfaces.Client;
import mage.interfaces.callback.CallbackClient;
import mage.utils.MageVersion;
import mage.sets.Sets;
import mage.remote.Connection;
@ -89,16 +98,24 @@ import org.apache.log4j.Logger;
/**
* @author BetaSteward_at_googlemail.com
*/
public class MageFrame extends javax.swing.JFrame {
public class MageFrame extends javax.swing.JFrame implements Client {
private final static Logger logger = Logger.getLogger(MageFrame.class);
private static Session session;
private static CallbackClient callbackClient;
private ConnectDialog connectDialog;
private static Preferences prefs = Preferences.userNodeForPackage(MageFrame.class);
private JLabel title;
private Rectangle titleRectangle;
private final static MageVersion version = new MageVersion(0, 7, 3);
private UUID clientId;
private static Map<UUID, ChatPanel> chats = new HashMap<UUID, ChatPanel>();
private static Map<UUID, GamePanel> games = new HashMap<UUID, GamePanel>();
private static Map<UUID, DraftPanel> drafts = new HashMap<UUID, DraftPanel>();
private static Map<UUID, TournamentPanel> tournaments = new HashMap<UUID, TournamentPanel>();
private static MageUI ui = new MageUI();
/**
* @return the session
@ -115,7 +132,8 @@ public class MageFrame extends javax.swing.JFrame {
return prefs;
}
public static MageVersion getVersion() {
@Override
public MageVersion getVersion() {
return version;
}
@ -125,7 +143,8 @@ public class MageFrame extends javax.swing.JFrame {
public MageFrame() {
setTitle("Mage, version " + version);
clientId = UUID.randomUUID();
EDTExceptionHandler.registerExceptionHandler();
addWindowListener(new WindowAdapter() {
@Override
@ -151,9 +170,10 @@ public class MageFrame extends javax.swing.JFrame {
this.setExtendedState(JFrame.MAXIMIZED_BOTH);
session = new Session(this);
callbackClient = new CallbackClientImpl(this);
connectDialog = new ConnectDialog();
desktopPane.add(connectDialog, JLayeredPane.POPUP_LAYER);
session.getUI().addComponent(MageComponents.DESKTOP_PANE, desktopPane);
ui.addComponent(MageComponents.DESKTOP_PANE, desktopPane);
try {
tablesPane = new TablesPane();
@ -240,7 +260,7 @@ public class MageFrame extends javax.swing.JFrame {
label.setBounds(0, 0, 180, 30);
}
session.getUI().addButton(MageComponents.TABLES_MENU_BUTTON, btnGames);
ui.addButton(MageComponents.TABLES_MENU_BUTTON, btnGames);
SwingUtilities.invokeLater(new Runnable() {
public void run() {
@ -272,8 +292,8 @@ public class MageFrame extends javax.swing.JFrame {
desktopPane.add(popupContainer, JLayeredPane.POPUP_LAYER);
session.getUI().addComponent(MageComponents.CARD_INFO_PANE, cardInfoPane);
session.getUI().addComponent(MageComponents.POPUP_CONTAINER, popupContainer);
ui.addComponent(MageComponents.CARD_INFO_PANE, cardInfoPane);
ui.addComponent(MageComponents.POPUP_CONTAINER, popupContainer);
}
private void setBackground() {
@ -723,7 +743,7 @@ public class MageFrame extends javax.swing.JFrame {
private void btnAboutActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnAboutActionPerformed
AboutDialog aboutDialog = new AboutDialog();
desktopPane.add(aboutDialog);
aboutDialog.showDialog();
aboutDialog.showDialog(version);
}//GEN-LAST:event_btnAboutActionPerformed
public void exitApp() {
@ -842,6 +862,72 @@ public class MageFrame extends javax.swing.JFrame {
this.lblStatus.setText(status);
}
public static MageUI getUI() {
return ui;
}
public static ChatPanel getChat(UUID chatId) {
return chats.get(chatId);
}
public static void addChat(UUID chatId, ChatPanel chatPanel) {
chats.put(chatId, chatPanel);
}
public static GamePanel getGame(UUID gameId) {
return games.get(gameId);
}
public static void addGame(UUID gameId, GamePanel gamePanel) {
games.put(gameId, gamePanel);
}
public static DraftPanel getDraft(UUID draftId) {
return drafts.get(draftId);
}
public static void addDraft(UUID draftId, DraftPanel draftPanel) {
drafts.put(draftId, draftPanel);
}
public static void addTournament(UUID tournamentId, TournamentPanel tournament) {
tournaments.put(tournamentId, tournament);
}
@Override
public UUID getId() {
return clientId;
}
@Override
public void connected(String message) {
setStatusText(message);
enableButtons();
}
@Override
public void disconnected() {
setStatusText("Not connected");
disableButtons();
hideGames();
hideTables();
}
@Override
public void showMessage(String message) {
JOptionPane.showMessageDialog(desktopPane, message);
}
@Override
public void showError(String message) {
JOptionPane.showMessageDialog(desktopPane, message, "Error", JOptionPane.ERROR_MESSAGE);
}
@Override
public void processCallback(ClientCallback callback) {
callbackClient.processCallback(callback);
}
}
class MagePaneMenuItem extends JCheckBoxMenuItem {

6
Mage.Client/src/main/java/mage/client/cards/Card.java
View file

@ -80,7 +80,7 @@ import mage.cards.MagePermanent;
import mage.cards.TextPopup;
import mage.client.MageFrame;
import mage.client.game.PlayAreaPanel;
import mage.client.remote.Session;
import mage.remote.Session;
import mage.client.util.Config;
import mage.client.util.DefaultActionCallback;
import mage.client.util.ImageHelper;
@ -382,13 +382,13 @@ public class Card extends MagePermanent implements MouseMotionListener, MouseLis
List<UUID> targets = card.getTargets();
if (targets != null) {
for (UUID uuid : targets) {
PlayAreaPanel p = session.getGame(gameId).getPlayers().get(uuid);
PlayAreaPanel p = MageFrame.getGame(gameId).getPlayers().get(uuid);
if (p != null) {
Point target = p.getLocationOnScreen();
Point me = this.getLocationOnScreen();
ArrowBuilder.addArrow((int)me.getX() + 35, (int)me.getY(), (int)target.getX() + 40, (int)target.getY() - 40, Color.red);
} else {
for (PlayAreaPanel pa : session.getGame(gameId).getPlayers().values()) {
for (PlayAreaPanel pa : MageFrame.getGame(gameId).getPlayers().values()) {
MagePermanent permanent = pa.getBattlefieldPanel().getPermanents().get(uuid);
if (permanent != null) {
Point target = permanent.getLocationOnScreen();

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

@ -39,11 +39,10 @@ import java.awt.event.KeyEvent;
import java.util.*;
import java.util.List;
import mage.client.MageFrame;
import mage.client.remote.Session;
import mage.remote.Session;
import mage.view.ChatMessage.MessageColor;
import javax.swing.table.AbstractTableModel;
import mage.client.remote.Session.SessionState;
/**
*
@ -52,7 +51,6 @@ import mage.client.remote.Session.SessionState;
public class ChatPanel extends javax.swing.JPanel {
private UUID chatId;
private UUID clientId;
private Session session;
private List<String> players = new ArrayList<String>();
@ -76,12 +74,13 @@ public class ChatPanel extends javax.swing.JPanel {
public void connect(UUID chatId) {
session = MageFrame.getSession();
this.chatId = chatId;
session.joinChat(chatId, this);
if (session.joinChat(chatId)) {
MageFrame.addChat(chatId, this);
}
}
public void disconnect() {
if (session != null && session.getState() == SessionState.CONNECTED)
session.leaveChat(chatId);
session.leaveChat(chatId);
}
public void receiveMessage(String message, MessageColor color) {

2
Mage.Client/src/main/java/mage/client/dialog/AboutDialog.form
View file

@ -49,7 +49,7 @@
<EmptySpace max="-2" attributes="0"/>
<Component id="jLabel2" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="jLabel3" pref="44" max="32767" attributes="0"/>
<Component id="jLabel3" pref="48" max="32767" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="btnOk" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>

5
Mage.Client/src/main/java/mage/client/dialog/AboutDialog.java
View file

@ -35,6 +35,7 @@
package mage.client.dialog;
import mage.client.MageFrame;
import mage.utils.MageVersion;
/**
*
@ -48,8 +49,8 @@ public class AboutDialog extends MageDialog {
this.modal = false;
}
public void showDialog() {
this.lblVersion.setText(MageFrame.getVersion().toString());
public void showDialog(MageVersion version) {
this.lblVersion.setText(version.toString());
this.setLocation(100, 100);
this.setVisible(true);
}

2
Mage.Client/src/main/java/mage/client/dialog/JoinTableDialog.java
View file

@ -38,7 +38,7 @@ package mage.client.dialog;
import mage.client.*;
import java.util.UUID;
import javax.swing.JOptionPane;
import mage.client.remote.Session;
import mage.remote.Session;
import mage.sets.Sets;
import org.apache.log4j.Logger;

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

@ -46,7 +46,7 @@ import javax.swing.SpinnerNumberModel;
import mage.Constants.MultiplayerAttackOption;
import mage.Constants.RangeOfInfluence;
import mage.client.components.MageComponents;
import mage.client.remote.Session;
import mage.remote.Session;
import mage.client.table.TablePlayerPanel;
import mage.client.util.Event;
import mage.client.util.Listener;
@ -410,7 +410,7 @@ public class NewTableDialog extends MageDialog {
public void showDialog(UUID roomId) {
session = MageFrame.getSession();
session.getUI().addButton(MageComponents.NEW_TABLE_OK_BUTTON, btnOK);
MageFrame.getUI().addButton(MageComponents.NEW_TABLE_OK_BUTTON, btnOK);
this.player1Panel.setPlayerName(session.getUserName());
cbGameType.setModel(new DefaultComboBoxModel(session.getGameTypes().toArray()));
cbDeckType.setModel(new DefaultComboBoxModel(session.getDeckTypes()));

2
Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.java
View file

@ -45,7 +45,7 @@ import mage.Constants.MultiplayerAttackOption;
import mage.Constants.RangeOfInfluence;
import mage.cards.ExpansionSet;
import mage.client.MageFrame;
import mage.client.remote.Session;
import mage.remote.Session;
import mage.client.table.TournamentPlayerPanel;
import mage.game.draft.DraftOptions;
import mage.game.draft.DraftOptions.TimingOption;

2
Mage.Client/src/main/java/mage/client/dialog/ReconnectDialog.java
View file

@ -37,7 +37,7 @@ import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.SwingWorker;
import mage.client.remote.Session;
import mage.remote.Session;
/**
*

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

@ -2,7 +2,6 @@
<Form version="1.6" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JInternalFrameFormInfo">
<Properties>
<Property name="closable" type="boolean" value="false"/>
<Property name="resizable" type="boolean" value="true"/>
<Property name="title" type="java.lang.String" value="Waiting for players"/>
</Properties>
@ -41,7 +40,7 @@
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<Component id="jSplitPane1" pref="267" max="32767" attributes="0"/>
<Component id="jSplitPane1" pref="271" max="32767" attributes="0"/>
<EmptySpace type="unrelated" min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="btnMoveDown" alignment="3" min="-2" max="-2" attributes="0"/>

4
Mage.Client/src/main/java/mage/client/dialog/TableWaitingDialog.java
View file

@ -40,7 +40,7 @@ import java.util.UUID;
import javax.swing.SwingWorker;
import javax.swing.table.AbstractTableModel;
import mage.client.components.MageComponents;
import mage.client.remote.Session;
import mage.remote.Session;
import mage.view.SeatView;
import mage.view.TableView;
import org.apache.log4j.Logger;
@ -69,7 +69,7 @@ public class TableWaitingDialog extends MageDialog {
initComponents();
tableSeats.createDefaultColumnsFromModel();
session.getUI().addButton(MageComponents.TABLE_WAITING_START_BUTTON, btnStart);
MageFrame.getUI().addButton(MageComponents.TABLE_WAITING_START_BUTTON, btnStart);
}
public void update(TableView table) {

4
Mage.Client/src/main/java/mage/client/draft/DraftPanel.java
View file

@ -41,7 +41,7 @@ import java.util.UUID;
import javax.swing.Timer;
import mage.client.MageFrame;
import mage.client.constants.Constants.SortBy;
import mage.client.remote.Session;
import mage.remote.Session;
import mage.client.util.Event;
import mage.client.util.Listener;
import mage.view.DraftPickView;
@ -81,7 +81,7 @@ public class DraftPanel extends javax.swing.JPanel {
public synchronized void showDraft(UUID draftId) {
this.draftId = draftId;
session = MageFrame.getSession();
session.addDraft(draftId, this);
MageFrame.addDraft(draftId, this);
if (!session.joinDraft(draftId))
hideDraft();
}

2
Mage.Client/src/main/java/mage/client/game/AbilityPicker.java
View file

@ -38,7 +38,7 @@ import javax.swing.JPopupMenu;
import javax.swing.event.PopupMenuEvent;
import javax.swing.event.PopupMenuListener;
import mage.client.MageFrame;
import mage.client.remote.Session;
import mage.remote.Session;
import mage.client.util.gui.GuiDisplayUtil;
import mage.view.AbilityPickerView;

2
Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java
View file

@ -49,7 +49,7 @@ import javax.swing.SwingUtilities;
import mage.client.MageFrame;
import mage.client.components.MageTextArea;
import mage.client.remote.Session;
import mage.remote.Session;
import org.apache.log4j.Logger;

8
Mage.Client/src/main/java/mage/client/game/GamePanel.java
View file

@ -57,7 +57,7 @@ import mage.client.dialog.PickNumberDialog;
import mage.client.dialog.ShowCardsDialog;
import mage.client.game.FeedbackPanel.FeedbackMode;
import mage.client.plugins.impl.Plugins;
import mage.client.remote.Session;
import mage.remote.Session;
import mage.client.util.Config;
import mage.client.util.GameManager;
import mage.client.util.PhaseManager;
@ -153,7 +153,7 @@ public class GamePanel extends javax.swing.JPanel {
this.gameId = gameId;
this.playerId = playerId;
session = MageFrame.getSession();
session.addGame(gameId, this);
MageFrame.addGame(gameId, this);
this.feedbackPanel.init(gameId);
this.feedbackPanel.clear();
this.abilityPicker.init(session, gameId);
@ -171,7 +171,7 @@ public class GamePanel extends javax.swing.JPanel {
this.gameId = gameId;
this.playerId = null;
session = MageFrame.getSession();
session.addGame(gameId, this);
MageFrame.addGame(gameId, this);
this.feedbackPanel.init(gameId);
this.feedbackPanel.clear();
this.btnConcede.setVisible(false);
@ -188,7 +188,7 @@ public class GamePanel extends javax.swing.JPanel {
this.gameId = gameId;
this.playerId = null;
session = MageFrame.getSession();
session.addGame(gameId, this);
MageFrame.addGame(gameId, this);
this.feedbackPanel.clear();
this.btnConcede.setVisible(false);
this.btnStopWatching.setVisible(false);

2
Mage.Client/src/main/java/mage/client/game/PlayerPanel.java
View file

@ -39,7 +39,7 @@ import java.util.UUID;
import mage.client.MageFrame;
import mage.client.cards.BigCard;
import mage.client.dialog.ShowCardsDialog;
import mage.client.remote.Session;
import mage.remote.Session;
import mage.client.util.Config;
import mage.view.PlayerView;

2
Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java
View file

@ -42,7 +42,7 @@ import mage.client.components.arcane.GlowText;
import mage.client.components.arcane.ManaSymbols;
import mage.client.components.arcane.UI;
import mage.client.dialog.ShowCardsDialog;
import mage.client.remote.Session;
import mage.remote.Session;
import mage.client.util.Command;
import mage.client.util.Config;
import mage.client.util.ImageHelper;

16
Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java
View file

@ -21,7 +21,7 @@ import mage.client.components.MageComponents;
import mage.client.components.MageRoundPane;
import mage.client.game.PlayAreaPanel;
import mage.client.plugins.impl.Plugins;
import mage.client.remote.Session;
import mage.remote.Session;
import mage.client.util.DefaultActionCallback;
import mage.client.util.ImageHelper;
import mage.client.util.gui.ArrowBuilder;
@ -85,13 +85,13 @@ public class MageActionCallback implements ActionCallback {
for (UUID uuid : targets) {
//System.out.println("Getting play area panel for uuid: " + uuid);
PlayAreaPanel p = session.getGame(data.gameId).getPlayers().get(uuid);
PlayAreaPanel p = MageFrame.getGame(data.gameId).getPlayers().get(uuid);
if (p != null) {
Point target = p.getLocationOnScreen();
target.translate(-parentPoint.x, -parentPoint.y);
ArrowBuilder.addArrow((int) me.getX() + 35, (int) me.getY(), (int) target.getX() + 40, (int) target.getY() - 40, Color.red);
} else {
for (PlayAreaPanel pa : session.getGame(data.gameId).getPlayers().values()) {
for (PlayAreaPanel pa : MageFrame.getGame(data.gameId).getPlayers().values()) {
MagePermanent permanent = pa.getBattlefieldPanel().getPermanents().get(uuid);
if (permanent != null) {
Point target = permanent.getLocationOnScreen();
@ -108,7 +108,7 @@ public class MageActionCallback implements ActionCallback {
Point me = new Point(data.locationOnScreen);
me.translate(-parentPoint.x, -parentPoint.y);
UUID uuid = data.card.getParentId();
for (PlayAreaPanel pa : session.getGame(data.gameId).getPlayers().values()) {
for (PlayAreaPanel pa : MageFrame.getGame(data.gameId).getPlayers().values()) {
MagePermanent permanent = pa.getBattlefieldPanel().getPermanents().get(uuid);
if (permanent != null) {
Point source = permanent.getLocationOnScreen();
@ -149,15 +149,15 @@ public class MageActionCallback implements ActionCallback {
if (session == null || !state) {
return;
}
final Component popupContainer = session.getUI().getComponent(MageComponents.POPUP_CONTAINER);
Component popup2 = session.getUI().getComponent(MageComponents.CARD_INFO_PANE);
final Component popupContainer = MageFrame.getUI().getComponent(MageComponents.POPUP_CONTAINER);
Component popup2 = MageFrame.getUI().getComponent(MageComponents.CARD_INFO_PANE);
((CardInfoPane) popup2).setCard(data.card);
Point location = new Point((int) data.locationOnScreen.getX() + data.popupOffsetX - 40, (int) data.locationOnScreen.getY() + data.popupOffsetY - 40);
location = GuiDisplayUtil.keepComponentInsideParent(location, parentPoint, popup2, parentComponent);
location.translate(-parentPoint.x, -parentPoint.y);
popupContainer.setLocation(location);
ThreadUtils.sleep(200);
final Component c = session.getUI().getComponent(MageComponents.DESKTOP_PANE);
final Component c = MageFrame.getUI().getComponent(MageComponents.DESKTOP_PANE);
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
@ -227,7 +227,7 @@ public class MageActionCallback implements ActionCallback {
if (session == null) {
return;
}
Component popupContainer = session.getUI().getComponent(MageComponents.POPUP_CONTAINER);
Component popupContainer = MageFrame.getUI().getComponent(MageComponents.POPUP_CONTAINER);
popupContainer.setVisible(false);
} catch (Exception e2) {
e2.printStackTrace();

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

@ -28,6 +28,7 @@
package mage.client.remote;
import mage.remote.Session;
import java.rmi.RemoteException;
import java.util.UUID;
import javax.swing.JOptionPane;
@ -55,20 +56,18 @@ import org.apache.log4j.Logger;
*
* @author BetaSteward_at_googlemail.com
*/
public class Client implements CallbackClient {
public class CallbackClientImpl implements CallbackClient {
private final static Logger logger = Logger.getLogger(Client.class);
private final static Logger logger = Logger.getLogger(CallbackClientImpl.class);
private UUID clientId;
private MageFrame frame;
private Session session;
private int messageId = 0;
public Client(Session session, MageFrame frame) {
public CallbackClientImpl(MageFrame frame) {
this.clientId = UUID.randomUUID();
this.frame = frame;
this.session = session;
}
@ -101,36 +100,36 @@ public class Client implements CallbackClient {
}
else if (callback.getMethod().equals("chatMessage")) {
ChatMessage message = (ChatMessage) callback.getData();
ChatPanel panel = session.getChat(callback.getObjectId());
ChatPanel panel = frame.getChat(callback.getObjectId());
if (panel != null)
panel.receiveMessage(message.getMessage(), message.getColor());
}
else if (callback.getMethod().equals("replayInit")) {
GamePanel panel = session.getGame(callback.getObjectId());
GamePanel panel = frame.getGame(callback.getObjectId());
if (panel != null)
panel.init((GameView) callback.getData());
}
else if (callback.getMethod().equals("replayDone")) {
GamePanel panel = session.getGame(callback.getObjectId());
GamePanel panel = frame.getGame(callback.getObjectId());
if (panel != null) {
panel.modalMessage((String) callback.getData());
panel.hideGame();
}
}
else if (callback.getMethod().equals("replayUpdate")) {
GamePanel panel = session.getGame(callback.getObjectId());
GamePanel panel = frame.getGame(callback.getObjectId());
if (panel != null)
panel.updateGame((GameView) callback.getData());
}
else if (callback.getMethod().equals("gameInit")) {
GamePanel panel = session.getGame(callback.getObjectId());
GamePanel panel = frame.getGame(callback.getObjectId());
if (panel != null) {
panel.init((GameView) callback.getData());
}
}
else if (callback.getMethod().equals("gameOver")) {
GamePanel panel = session.getGame(callback.getObjectId());
GamePanel panel = frame.getGame(callback.getObjectId());
if (panel != null) {
panel.modalMessage((String) callback.getData());
panel.hideGame();
@ -138,53 +137,53 @@ public class Client implements CallbackClient {
}
else if (callback.getMethod().equals("gameAsk")) {
GameClientMessage message = (GameClientMessage) callback.getData();
GamePanel panel = session.getGame(callback.getObjectId());
GamePanel panel = frame.getGame(callback.getObjectId());
if (panel != null)
panel.ask(message.getMessage(), message.getGameView());
}
else if (callback.getMethod().equals("gameTarget")) {
GameClientMessage message = (GameClientMessage) callback.getData();
GamePanel panel = session.getGame(callback.getObjectId());
GamePanel panel = frame.getGame(callback.getObjectId());
if (panel != null)
panel.pickTarget(message.getMessage(), message.getCardsView(), message.getGameView(), message.getTargets(), message.isFlag(), message.getOptions());
}
else if (callback.getMethod().equals("gameSelect")) {
GameClientMessage message = (GameClientMessage) callback.getData();
GamePanel panel = session.getGame(callback.getObjectId());
GamePanel panel = frame.getGame(callback.getObjectId());
if (panel != null)
panel.select(message.getMessage(), message.getGameView());
}
else if (callback.getMethod().equals("gameChooseAbility")) {
GamePanel panel = session.getGame(callback.getObjectId());
GamePanel panel = frame.getGame(callback.getObjectId());
if (panel != null)
panel.pickAbility((AbilityPickerView) callback.getData());
}
else if (callback.getMethod().equals("gameChoose")) {
GameClientMessage message = (GameClientMessage) callback.getData();
GamePanel panel = session.getGame(callback.getObjectId());
GamePanel panel = frame.getGame(callback.getObjectId());
if (panel != null)
panel.getChoice(message.getMessage(), message.getStrings());
}
else if (callback.getMethod().equals("gamePlayMana")) {
GameClientMessage message = (GameClientMessage) callback.getData();
GamePanel panel = session.getGame(callback.getObjectId());
GamePanel panel = frame.getGame(callback.getObjectId());
if (panel != null)
panel.playMana(message.getMessage(), message.getGameView());
}
else if (callback.getMethod().equals("gamePlayXMana")) {
GameClientMessage message = (GameClientMessage) callback.getData();
GamePanel panel = session.getGame(callback.getObjectId());
GamePanel panel = frame.getGame(callback.getObjectId());
if (panel != null)
panel.playXMana(message.getMessage(), message.getGameView());
}
else if (callback.getMethod().equals("gameSelectAmount")) {
GameClientMessage message = (GameClientMessage) callback.getData();
GamePanel panel = session.getGame(callback.getObjectId());
GamePanel panel = frame.getGame(callback.getObjectId());
if (panel != null)
panel.getAmount(message.getMin(), message.getMax(), message.getMessage());
}
else if (callback.getMethod().equals("gameUpdate")) {
GamePanel panel = session.getGame(callback.getObjectId());
GamePanel panel = frame.getGame(callback.getObjectId());
if (panel != null)
panel.updateGame((GameView) callback.getData());
}
@ -192,7 +191,7 @@ public class Client implements CallbackClient {
if (callback.getMessageId() > messageId) {
GameClientMessage message = (GameClientMessage) callback.getData();
GamePanel panel = session.getGame(callback.getObjectId());
GamePanel panel = frame.getGame(callback.getObjectId());
if (panel != null)
panel.inform(message.getMessage(), message.getGameView());
}
@ -209,18 +208,18 @@ public class Client implements CallbackClient {
construct(message.getDeck(), message.getTableId(), message.getTime());
}
else if (callback.getMethod().equals("draftOver")) {
DraftPanel panel = session.getDraft(callback.getObjectId());
DraftPanel panel = frame.getDraft(callback.getObjectId());
if (panel != null)
panel.hideDraft();
}
else if (callback.getMethod().equals("draftPick")) {
DraftClientMessage message = (DraftClientMessage) callback.getData();
DraftPanel panel = session.getDraft(callback.getObjectId());
DraftPanel panel = frame.getDraft(callback.getObjectId());
if (panel != null)
panel.loadBooster(message.getDraftPickView());
}
else if (callback.getMethod().equals("draftUpdate")) {
DraftPanel panel = session.getDraft(callback.getObjectId());
DraftPanel panel = frame.getDraft(callback.getObjectId());
if (panel != null)
panel.updateDraft((DraftView) callback.getData());
}
@ -247,7 +246,7 @@ public class Client implements CallbackClient {
});
}
public UUID getId() throws RemoteException {
public UUID getId() {
return clientId;
}
@ -315,9 +314,7 @@ public class Client implements CallbackClient {
private void handleException(Exception ex) {
logger.fatal("Client error\n", ex);
JOptionPane.showMessageDialog(MageFrame.getDesktop(), "Unrecoverable client error. Disconnecting", "Error", JOptionPane.ERROR_MESSAGE);
session.disconnect(false);
frame.disableButtons();
frame.showError("Error: " + ex.getMessage());
}
}

37
Mage.Client/src/main/java/mage/client/remote/MageRemoteException.java
View file

@ -1,37 +0,0 @@
/*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.client.remote;
/**
*
* @author BetaSteward_at_googlemail.com
*/
public class MageRemoteException extends Exception {
}

917
Mage.Client/src/main/java/mage/client/remote/Session.java
View file

@ -1,917 +0,0 @@
/*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.client.remote;
import java.net.Authenticator;
import java.net.PasswordAuthentication;
import java.rmi.RemoteException;
import java.rmi.registry.LocateRegistry;
import java.rmi.registry.Registry;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.UUID;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import javax.swing.JOptionPane;
import mage.cards.decks.DeckCardLists;
import mage.client.MageFrame;
import mage.client.chat.ChatPanel;
import mage.client.components.MageUI;
import mage.client.draft.DraftPanel;
import mage.client.game.GamePanel;
import mage.remote.method.*;
import mage.client.tournament.TournamentPanel;
import mage.game.GameException;
import mage.MageException;
import mage.cards.decks.InvalidDeckException;
import mage.game.match.MatchOptions;
import mage.game.tournament.TournamentOptions;
import mage.interfaces.ServerState;
import mage.interfaces.callback.CallbackClientDaemon;
import mage.remote.Connection;
import mage.remote.RMIClientDaemon;
import mage.remote.RemoteMethodCallQueue;
import mage.remote.ServerCache;
import mage.remote.ServerUnavailable;
import mage.utils.MageVersion;
import mage.view.DraftPickView;
import mage.view.GameTypeView;
import mage.view.TableView;
import mage.view.TournamentTypeView;
import mage.view.TournamentView;
import org.apache.log4j.Logger;
/**
*
* @author BetaSteward_at_googlemail.com
*/
public class Session {
private final static Logger logger = Logger.getLogger(Session.class);
private static ScheduledExecutorService sessionExecutor = Executors.newScheduledThreadPool(1);
public enum SessionState {
DISCONNECTED, CONNECTED, CONNECTING, DISCONNECTING, SERVER_UNAVAILABLE;
}
private UUID sessionId;
private Client client;
private String userName;
private MageFrame frame;
private ServerState serverState;
private SessionState sessionState = SessionState.DISCONNECTED;
private Map<UUID, ChatPanel> chats = new HashMap<UUID, ChatPanel>();
private Map<UUID, GamePanel> games = new HashMap<UUID, GamePanel>();
private Map<UUID, DraftPanel> drafts = new HashMap<UUID, DraftPanel>();
private Map<UUID, TournamentPanel> tournaments = new HashMap<UUID, TournamentPanel>();
private CallbackClientDaemon callbackDaemon;
private RMIClientDaemon rmiDaemon;
private RemoteMethodCallQueue q = new RemoteMethodCallQueue();
private ScheduledFuture<?> future;
private MageUI ui = new MageUI();
private Connection connection;
public Session(MageFrame frame) {
this.frame = frame;
rmiDaemon = new RMIClientDaemon(q);
}
public synchronized boolean connect(Connection connection) {
if (this.connection != null && sessionState == SessionState.DISCONNECTED) {
disconnect(true);
}
this.connection = connection;
return connect();
}
public boolean connect() {
sessionState = SessionState.CONNECTING;
try {
System.setSecurityManager(null);
System.setProperty("http.nonProxyHosts", "code.google.com");
System.setProperty("socksNonProxyHosts", "code.google.com");
// clear previous values
System.clearProperty("socksProxyHost");
System.clearProperty("socksProxyPort");
System.clearProperty("http.proxyHost");
System.clearProperty("http.proxyPort");
switch (connection.getProxyType()) {
case SOCKS:
System.setProperty("socksProxyHost", connection.getProxyHost());
System.setProperty("socksProxyPort", Integer.toString(connection.getProxyPort()));
break;
case HTTP:
System.setProperty("http.proxyHost", connection.getProxyHost());
System.setProperty("http.proxyPort", Integer.toString(connection.getProxyPort()));
Authenticator.setDefault(new MageAuthenticator(connection.getProxyUsername(), connection.getProxyPassword()));
break;
}
Registry reg = LocateRegistry.getRegistry(connection.getHost(), connection.getPort());
this.userName = connection.getUsername();
if (client == null)
client = new Client(this, frame);
sessionId = registerClient(userName, client.getId(), frame.getVersion());
callbackDaemon = new CallbackClientDaemon(sessionId, client, connection);
serverState = getServerState();
future = sessionExecutor.scheduleWithFixedDelay(new ServerPinger(), 5, 5, TimeUnit.SECONDS);
logger.info("Connected to RMI server at " + connection.getHost() + ":" + connection.getPort());
frame.setStatusText("Connected to " + connection.getHost() + ":" + connection.getPort() + " ");
frame.enableButtons();
sessionState = SessionState.CONNECTED;
return true;
} catch (Exception ex) {
logger.fatal("", ex);
if (sessionState == SessionState.CONNECTING) {
disconnect(false);
JOptionPane.showMessageDialog(frame, "Unable to connect to server. " + ex.getMessage());
}
sessionState = SessionState.SERVER_UNAVAILABLE;
}
return false;
}
public synchronized void disconnect(boolean voluntary) {
sessionState = SessionState.DISCONNECTING;
if (connection == null)
return;
if (future != null && !future.isDone())
future.cancel(true);
frame.setStatusText("Not connected");
frame.disableButtons();
try {
for (UUID chatId: chats.keySet()) {
leaveChat(chatId);
}
}
catch (Exception ignore) {
//swallow all exceptions at this point
}
try {
if (callbackDaemon != null)
callbackDaemon.stopDaemon();
deregisterClient();
} catch (MageException ex) {
logger.fatal("Error disconnecting ...", ex);
}
ServerCache.removeServerFromCache(connection);
frame.hideGames();
frame.hideTables();
logger.info("Disconnected ... ");
if (!voluntary)
JOptionPane.showMessageDialog(MageFrame.getDesktop(), "Server error. You have been disconnected", "Error", JOptionPane.ERROR_MESSAGE);
}
public boolean ping() {
Ping method = new Ping(connection, sessionId);
try {
q.callMethod(method);
return method.getReturnVal();
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("ping error", ex);
}
return false;
}
private UUID registerClient(String userName, UUID clientId, MageVersion version) throws MageException, ServerUnavailable {
RegisterClient method = new RegisterClient(connection, userName, clientId, version);
try {
q.callMethod(method);
return method.getReturnVal();
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("registerClient error", ex);
}
return null;
}
private void deregisterClient() throws MageException {
DeregisterClient method = new DeregisterClient(connection, sessionId);
try {
q.callMethod(method);
} catch (ServerUnavailable ex) {
logger.fatal("server unavailable - ", ex);
}
}
private ServerState getServerState() {
GetServerState method = new GetServerState(connection);
try {
q.callMethod(method);
return method.getReturnVal();
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("GetServerState error", ex);
}
return null;
}
public SessionState getState() {
return sessionState;
}
public boolean isConnected() {
return sessionState == SessionState.CONNECTED;
}
public String[] getPlayerTypes() {
return serverState.getPlayerTypes();
}
public List<GameTypeView> getGameTypes() {
return serverState.getGameTypes();
}
public String[] getDeckTypes() {
return serverState.getDeckTypes();
}
public List<TournamentTypeView> getTournamentTypes() {
return serverState.getTournamentTypes();
}
public boolean isTestMode() {
if (serverState != null)
return serverState.isTestMode();
return false;
}
public ChatPanel getChat(UUID chatId) {
return chats.get(chatId);
}
public GamePanel getGame(UUID gameId) {
return games.get(gameId);
}
public void addGame(UUID gameId, GamePanel gamePanel) {
games.put(gameId, gamePanel);
}
public DraftPanel getDraft(UUID draftId) {
return drafts.get(draftId);
}
public void addDraft(UUID draftId, DraftPanel draftPanel) {
drafts.put(draftId, draftPanel);
}
public void addTournament(UUID tournamentId, TournamentPanel tournament) {
tournaments.put(tournamentId, tournament);
}
public UUID getMainRoomId() {
GetMainRoomId method = new GetMainRoomId(connection);
try {
q.callMethod(method);
return method.getReturnVal();
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("GetMainRoomId error", ex);
}
return null;
}
public UUID getRoomChatId(UUID roomId) {
GetRoomChatId method = new GetRoomChatId(connection, roomId);
try {
q.callMethod(method);
return method.getReturnVal();
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("GetRoomChatId error", ex);
}
return null;
}
public UUID getTableChatId(UUID tableId) {
GetTableChatId method = new GetTableChatId(connection, tableId);
try {
q.callMethod(method);
return method.getReturnVal();
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("GetTableChatId error", ex);
}
return null;
}
public UUID getGameChatId(UUID gameId) {
GetGameChatId method = new GetGameChatId(connection, gameId);
try {
q.callMethod(method);
return method.getReturnVal();
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("GetGameChatId error", ex);
}
return null;
}
public TableView getTable(UUID roomId, UUID tableId) {
GetTable method = new GetTable(connection, roomId, tableId);
try {
q.callMethod(method);
return method.getReturnVal();
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("GetTable error", ex);
}
return null;
}
public boolean watchTable(UUID roomId, UUID tableId) {
WatchTable method = new WatchTable(connection, sessionId, roomId, tableId);
try {
q.callMethod(method);
return method.getReturnVal();
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("WatchTable error", ex);
}
return false;
}
public boolean joinTable(UUID roomId, UUID tableId, String playerName, String playerType, int skill, DeckCardLists deckList) {
JoinTable method = new JoinTable(connection, sessionId, roomId, tableId, playerName, playerType, skill, deckList);
try {
q.callMethod(method);
return method.getReturnVal();
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (GameException ex) {
handleGameException(ex);
} catch (InvalidDeckException ex) {
handleInvalidDeckException(ex);
} catch (MageException ex) {
logger.fatal("JoinTable error", ex);
}
return false;
}
public boolean joinTournamentTable(UUID roomId, UUID tableId, String playerName, String playerType, int skill) {
JoinTournamentTable method = new JoinTournamentTable(connection, sessionId, roomId, tableId, playerName, playerType, skill);
try {
q.callMethod(method);
return method.getReturnVal();
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (GameException ex) {
handleGameException(ex);
} catch (MageException ex) {
logger.fatal("JoinTournamentTable error", ex);
}
return false;
}
public Collection<TableView> getTables(UUID roomId) throws MageRemoteException {
GetTables method = new GetTables(connection, roomId);
try {
q.callMethod(method);
return method.getReturnVal();
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("GetTables error", ex);
}
return null;
}
public Collection<String> getConnectedPlayers(UUID roomId) throws MageRemoteException {
GetConnectedPlayers method = new GetConnectedPlayers(connection, roomId);
try {
q.callMethod(method);
return method.getReturnVal();
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("GetConnectedPlayers error", ex);
}
return null;
}
public TournamentView getTournament(UUID tournamentId) throws MageRemoteException {
GetTournament method = new GetTournament(connection, tournamentId);
try {
q.callMethod(method);
return method.getReturnVal();
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("GetTable error", ex);
}
return null;
}
public UUID getTournamentChatId(UUID tournamentId) {
GetTournamentChatId method = new GetTournamentChatId(connection, tournamentId);
try {
q.callMethod(method);
return method.getReturnVal();
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("GetTournamentChatId error", ex);
}
return null;
}
public boolean sendPlayerUUID(UUID gameId, UUID data) {
SendPlayerUUID method = new SendPlayerUUID(connection, sessionId, gameId, data);
try {
q.callMethod(method);
return true;
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("SendPlayerUUID error", ex);
}
return false;
}
public boolean sendPlayerBoolean(UUID gameId, boolean data) {
SendPlayerBoolean method = new SendPlayerBoolean(connection, sessionId, gameId, data);
try {
q.callMethod(method);
return true;
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("SendPlayerBoolean error", ex);
}
return false;
}
public boolean sendPlayerInteger(UUID gameId, int data) {
SendPlayerInteger method = new SendPlayerInteger(connection, sessionId, gameId, data);
try {
q.callMethod(method);
return true;
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("SendPlayerInteger error", ex);
}
return false;
}
public boolean sendPlayerString(UUID gameId, String data) {
SendPlayerString method = new SendPlayerString(connection, sessionId, gameId, data);
try {
q.callMethod(method);
return true;
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("SendPlayerString error", ex);
}
return false;
}
public DraftPickView sendCardPick(UUID draftId, UUID cardId) {
SendCardPick method = new SendCardPick(connection, sessionId, draftId, cardId);
try {
q.callMethod(method);
return method.getReturnVal();
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("SendCardPick error", ex);
}
return null;
}
public boolean joinChat(UUID chatId, ChatPanel chat) {
JoinChat method = new JoinChat(connection, sessionId, chatId, userName);
try {
q.callMethod(method);
chats.put(chatId, chat);
return true;
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("JoinChat error", ex);
}
return false;
}
public boolean leaveChat(UUID chatId) {
LeaveChat method = new LeaveChat(connection, sessionId, chatId);
try {
q.callMethod(method);
chats.remove(chatId);
return true;
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("LeaveChat error", ex);
}
return false;
}
public boolean sendChatMessage(UUID chatId, String message) {
SendChatMessage method = new SendChatMessage(connection, chatId, message, userName);
try {
q.callMethod(method);
return true;
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("SendChatMessage error", ex);
}
return false;
}
public boolean joinGame(UUID gameId) {
JoinGame method = new JoinGame(connection, sessionId, gameId);
try {
q.callMethod(method);
return true;
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("JoinGame error", ex);
}
return false;
}
public boolean joinDraft(UUID draftId) {
JoinDraft method = new JoinDraft(connection, sessionId, draftId);
try {
q.callMethod(method);
return true;
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("JoinDraft error", ex);
}
return false;
}
public boolean joinTournament(UUID tournamentId) {
JoinTournament method = new JoinTournament(connection, sessionId, tournamentId);
try {
q.callMethod(method);
return true;
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("JoinTournament error", ex);
}
return false;
}
public boolean watchGame(UUID gameId) {
WatchGame method = new WatchGame(connection, sessionId, gameId);
try {
q.callMethod(method);
return true;
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("WatchGame error", ex);
}
return false;
}
public boolean replayGame(UUID gameId) {
ReplayGame method = new ReplayGame(connection, sessionId, gameId);
try {
q.callMethod(method);
return true;
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("ReplayGame error", ex);
}
return false;
}
public TableView createTable(UUID roomId, MatchOptions matchOptions) {
CreateTable method = new CreateTable(connection, sessionId, roomId, matchOptions);
try {
q.callMethod(method);
return method.getReturnVal();
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("CreateTable error", ex);
}
return null;
}
public TableView createTournamentTable(UUID roomId, TournamentOptions tournamentOptions) {
CreateTournamentTable method = new CreateTournamentTable(connection, sessionId, roomId, tournamentOptions);
try {
q.callMethod(method);
return method.getReturnVal();
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("CreateTournamentTable error", ex);
}
return null;
}
public boolean isTableOwner(UUID roomId, UUID tableId) {
IsTableOwner method = new IsTableOwner(connection, sessionId, roomId, tableId);
try {
q.callMethod(method);
return method.getReturnVal();
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("IsTableOwner error", ex);
}
return false;
}
public boolean removeTable(UUID roomId, UUID tableId) {
RemoveTable method = new RemoveTable(connection, sessionId, roomId, tableId);
try {
q.callMethod(method);
return true;
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("RemoveTable error", ex);
}
return false;
}
public boolean swapSeats(UUID roomId, UUID tableId, int seatNum1, int seatNum2) {
SwapSeats method = new SwapSeats(connection, sessionId, roomId, tableId, seatNum1, seatNum2);
try {
q.callMethod(method);
return true;
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("RemoveTable error", ex);
}
return false;
}
public boolean leaveTable(UUID roomId, UUID tableId) {
LeaveTable method = new LeaveTable(connection, sessionId, roomId, tableId);
try {
q.callMethod(method);
return true;
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("LeaveTable error", ex);
}
return false;
}
public boolean startGame(UUID roomId, UUID tableId) {
StartGame method = new StartGame(connection, sessionId, roomId, tableId);
try {
q.callMethod(method);
return true;
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("StartGame error", ex);
}
return false;
}
public boolean startTournament(UUID roomId, UUID tableId) {
StartTournament method = new StartTournament(connection, sessionId, roomId, tableId);
try {
q.callMethod(method);
return true;
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("StartTournament error", ex);
}
return false;
}
public boolean startChallenge(UUID roomId, UUID tableId, UUID challengeId) {
StartChallenge method = new StartChallenge(connection, sessionId, roomId, tableId, challengeId);
try {
q.callMethod(method);
return true;
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("StartChallenge error", ex);
}
return false;
}
public boolean submitDeck(UUID tableId, DeckCardLists deck) {
SubmitDeck method = new SubmitDeck(connection, sessionId, tableId, deck);
try {
q.callMethod(method);
return method.getReturnVal();
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (InvalidDeckException ex) {
handleInvalidDeckException(ex);
} catch (GameException ex) {
handleGameException(ex);
} catch (MageException ex) {
logger.fatal("SubmitDeck error", ex);
}
return false;
}
public boolean concedeGame(UUID gameId) {
ConcedeGame method = new ConcedeGame(connection, sessionId, gameId);
try {
q.callMethod(method);
return true;
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("ConcedeGame error", ex);
}
return false;
}
public boolean stopWatching(UUID gameId) {
StopWatching method = new StopWatching(connection, sessionId, gameId);
try {
q.callMethod(method);
return true;
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("StopWatching error", ex);
}
return false;
}
public boolean startReplay(UUID gameId) {
StartReplay method = new StartReplay(connection, sessionId, gameId);
try {
q.callMethod(method);
return true;
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("StartReplay error", ex);
}
return false;
}
public boolean stopReplay(UUID gameId) {
StopReplay method = new StopReplay(connection, sessionId, gameId);
try {
q.callMethod(method);
return true;
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("StopReplay error", ex);
}
return false;
}
public boolean nextPlay(UUID gameId) {
NextPlay method = new NextPlay(connection, sessionId, gameId);
try {
q.callMethod(method);
return true;
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("NextPlay error", ex);
}
return false;
}
public boolean previousPlay(UUID gameId) {
PreviousPlay method = new PreviousPlay(connection, sessionId, gameId);
try {
q.callMethod(method);
return true;
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("PreviousPlay error", ex);
}
return false;
}
public boolean cheat(UUID gameId, UUID playerId, DeckCardLists deckList) {
Cheat method = new Cheat(connection, sessionId, gameId, playerId, deckList);
try {
q.callMethod(method);
return true;
} catch (ServerUnavailable ex) {
handleServerUnavailable(ex);
} catch (MageException ex) {
logger.fatal("Cheat error", ex);
}
return false;
}
// private void handleRemoteException(RemoteException ex) {
// logger.fatal("Communication error", ex);
// disconnect(false);
// }
// private void handleMageException(MageException ex) {
// logger.fatal("Server error", ex);
// disconnect(false);
// }
private void handleServerUnavailable(ServerUnavailable ex) {
logger.fatal("server unavailable - ", ex);
disconnect(false);
}
private void handleGameException(GameException ex) {
logger.warn(ex.getMessage());
JOptionPane.showMessageDialog(MageFrame.getDesktop(), ex.getMessage(), "Error", JOptionPane.ERROR_MESSAGE);
}
private void handleInvalidDeckException(InvalidDeckException ex) {
StringBuilder sbMessage = new StringBuilder();
logger.warn(ex.getMessage());
sbMessage.append(ex.getMessage()).append("\n");
for (Entry<String, String> entry: ex.getInvalid().entrySet()) {
sbMessage.append(entry.getKey()).append(":").append(entry.getValue()).append("\n");
}
JOptionPane.showMessageDialog(MageFrame.getDesktop(), sbMessage.toString(), "Invalid Deck", JOptionPane.ERROR_MESSAGE);
}
public String getUserName() {
return userName;
}
public MageUI getUI() {
return ui;
}
class ServerPinger implements Runnable {
@Override
public void run() {
ping();
}
}
}
class MageAuthenticator extends Authenticator {
private String username;
private String password;
public MageAuthenticator(String username, String password) {
this.username = username;
this.password = password;
}
@Override
public PasswordAuthentication getPasswordAuthentication () {
return new PasswordAuthentication (username, password.toCharArray());
}
}

2
Mage.Client/src/main/java/mage/client/table/TablePlayerPanel.java
View file

@ -41,7 +41,7 @@ import java.util.UUID;
import javax.swing.DefaultComboBoxModel;
import mage.client.MageFrame;
import mage.client.remote.Session;
import mage.remote.Session;
import mage.client.util.Config;
import mage.client.util.Event;
import mage.client.util.Listener;

8
Mage.Client/src/main/java/mage/client/table/TablesPanel.java
View file

@ -43,8 +43,8 @@ import mage.client.dialog.JoinTableDialog;
import mage.client.dialog.NewTableDialog;
import mage.client.dialog.NewTournamentDialog;
import mage.client.dialog.TableWaitingDialog;
import mage.client.remote.MageRemoteException;
import mage.client.remote.Session;
import mage.remote.MageRemoteException;
import mage.remote.Session;
import mage.client.util.ButtonColumn;
import mage.game.match.MatchOptions;
import mage.sets.Sets;
@ -101,7 +101,7 @@ public class TablesPanel extends javax.swing.JPanel {
if (state.equals("Join")) {
if (owner.equals(session.getUserName())) {
try {
JDesktopPane desktopPane = (JDesktopPane)session.getUI().getComponent(MageComponents.DESKTOP_PANE);
JDesktopPane desktopPane = (JDesktopPane)MageFrame.getUI().getComponent(MageComponents.DESKTOP_PANE);
JInternalFrame[] windows = desktopPane.getAllFramesInLayer(javax.swing.JLayeredPane.DEFAULT_LAYER);
for (JInternalFrame frame : windows) {
if (frame.getTitle().equals("Waiting for players")) {
@ -204,7 +204,7 @@ public class TablesPanel extends javax.swing.JPanel {
hideTables();
}
session.getUI().addButton(MageComponents.NEW_GAME_BUTTON, btnNewTable);
MageFrame.getUI().addButton(MageComponents.NEW_GAME_BUTTON, btnNewTable);
}
public void hideTables() {

2
Mage.Client/src/main/java/mage/client/table/TournamentPlayerPanel.java
View file

@ -38,7 +38,7 @@ import java.util.UUID;
import javax.swing.DefaultComboBoxModel;
import javax.swing.JComboBox;
import mage.client.MageFrame;
import mage.client.remote.Session;
import mage.remote.Session;
/**
*

6
Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java
View file

@ -45,8 +45,8 @@ import java.util.UUID;
import javax.swing.*;
import javax.swing.table.AbstractTableModel;
import mage.client.MageFrame;
import mage.client.remote.MageRemoteException;
import mage.client.remote.Session;
import mage.remote.MageRemoteException;
import mage.remote.Session;
import mage.client.util.ButtonColumn;
import mage.view.RoundView;
import mage.view.TournamentGameView;
@ -101,7 +101,7 @@ public class TournamentPanel extends javax.swing.JPanel implements Observer {
public synchronized void showTournament(UUID tournamentId) {
this.tournamentId = tournamentId;
session = MageFrame.getSession();
session.addTournament(tournamentId, this);
MageFrame.addTournament(tournamentId, this);
UUID chatRoomId = session.getTournamentChatId(tournamentId);
if (session.joinTournament(tournamentId) && chatRoomId != null) {
this.chatPanel1.connect(chatRoomId);

2
Mage.Client/src/main/java/mage/client/util/DefaultActionCallback.java
View file

@ -3,7 +3,7 @@ package mage.client.util;
import java.awt.event.MouseEvent;
import java.util.UUID;
import mage.client.remote.Session;
import mage.remote.Session;
import mage.view.CardView;