github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-28 19:19:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added user info text that user can set. Addd chat whisper command. Some minor changes to chat. Impoved display of user list.

Browse source
This commit is contained in:
LevelX2 2014-01-09 13:26:25 +01:00
parent e9dd478848
commit c0323c168c
19 changed files with 522 additions and 356 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Mage.Client/sounds/OnPlayerWhispered.wav Normal file
View file

Binary file not shown.

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

@ -1,56 +1,58 @@
/* /*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without modification, are * Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met: * permitted provided that the following conditions are met:
* *
* 1. Redistributions of source code must retain the above copyright notice, this list of * 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer. * conditions and the following disclaimer.
* *
* 2. Redistributions in binary form must reproduce the above copyright notice, this list * 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 * of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution. * provided with the distribution.
* *
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED * 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 * 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 * 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 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 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 * 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 * 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 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* The views and conclusions contained in the software and documentation are those of the * 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 * authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com. * or implied, of BetaSteward_at_googlemail.com.
*/ */
/* /*
* ChatPanel.java * ChatPanel.java
* *
* Created on 15-Dec-2009, 11:04:31 PM * Created on 15-Dec-2009, 11:04:31 PM
*/ */
package mage.client.chat; package mage.client.chat;
import java.awt.Color; import java.awt.Color;
import java.awt.event.KeyEvent; import java.awt.event.KeyEvent;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections;
import java.util.EnumMap; import java.util.EnumMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
import javax.print.attribute.standard.MediaSize;
import javax.swing.JTextField; import javax.swing.JTextField;
import javax.swing.table.AbstractTableModel; import javax.swing.table.AbstractTableModel;
import javax.swing.table.JTableHeader; import javax.swing.table.JTableHeader;
import javax.swing.table.TableColumn; import javax.swing.table.TableColumn;
import javax.swing.table.TableColumnModel; import javax.swing.table.TableColumnModel;
import mage.client.MageFrame; import mage.client.MageFrame;
import mage.remote.MageRemoteException;
import mage.remote.Session; import mage.remote.Session;
import mage.view.ChatMessage.MessageColor; import mage.view.ChatMessage.MessageColor;
import mage.view.ChatMessage.MessageType;
import mage.view.UsersView;
/** /**
* *
@ -60,51 +62,52 @@ public class ChatPanel extends javax.swing.JPanel {
private UUID chatId; private UUID chatId;
private Session session; private Session session;
private List<String> players = new ArrayList<String>(); private List<String> players = new ArrayList<String>();
private final TableModel tableModel; private final TableModel tableModel;
/** /**
* Chat message color for opponents. * Chat message color for opponents.
*/ */
private static final Color OPPONENT_COLOR = new Color(0, 230, 64); private static final Color OPPONENT_COLOR = new Color(238, 230, 133);
/** /**
* Chat message color for client player. * Chat message color for client player.
*/ */
private static final Color MY_COLOR = new Color(0, 230, 64); private static final Color MY_COLOR = new Color(0, 230, 64);
/** /**
* Chat message color for timestamps. * Chat message color for timestamps.
*/ */
private static final Color TIMESTAMP_COLOR = new Color(255, 255, 0, 120); private static final Color TIMESTAMP_COLOR = new Color(255, 255, 0, 120);
/** /**
* Chat message color for messages. * Chat message color for messages.
*/ */
private static final Color MESSAGE_COLOR = Color.white; private static final Color MESSAGE_COLOR = Color.white;
/** /**
* This will be a chat that will be connected to {this} and will handle redirected messages; * Chat message color for personal infos.
* Mostly used to redirect user messages to another window. */
private static final Color USER_INFO_COLOR = Color.YELLOW;
/**
* Chat message color for status infos.
*/
private static final Color STATUS_COLOR = Color.CYAN;
/**
* This will be a chat that will be connected to {this} and will handle
* redirected messages; Mostly used to redirect user messages to another
* window.
*/ */
private ChatPanel connectedChat; private ChatPanel connectedChat;
/** /**
* Parent chat this chat connected to. * Parent chat this chat connected to. Used to send messages using parent
* Used to send messages using parent chat as it is the only one connected to server. * chat as it is the only one connected to server.
*/ */
private ChatPanel parentChatRef; private ChatPanel parentChatRef;
/** /**
* Selected extended view mode. * Selected extended view mode.
*/ */
private VIEW_MODE extendedViewMode = VIEW_MODE.NONE; private VIEW_MODE extendedViewMode = VIEW_MODE.NONE;
public enum VIEW_MODE { public enum VIEW_MODE {
NONE, GAME, CHAT NONE, GAME, CHAT
} }
/** /**
* Controls the output start messages as the chat panel is created * Controls the output start messages as the chat panel is created
* *
@ -112,11 +115,10 @@ public class ChatPanel extends javax.swing.JPanel {
private ChatType chatType = ChatType.DEFAULT; private ChatType chatType = ChatType.DEFAULT;
public enum ChatType { public enum ChatType {
DEFAULT, GAME, TABLES, TOURNAMENT DEFAULT, GAME, TABLES, TOURNAMENT
} }
private boolean startMessageDone = false; private boolean startMessageDone = false;
/** /**
* Maps message colors to {@link Color}. * Maps message colors to {@link Color}.
*/ */
@ -128,9 +130,12 @@ public class ChatPanel extends javax.swing.JPanel {
colorMap.put(MessageColor.ORANGE, Color.orange); colorMap.put(MessageColor.ORANGE, Color.orange);
colorMap.put(MessageColor.BLUE, Color.blue); colorMap.put(MessageColor.BLUE, Color.blue);
colorMap.put(MessageColor.RED, Color.red); colorMap.put(MessageColor.RED, Color.red);
colorMap.put(MessageColor.YELLOW, Color.YELLOW);
} }
/** Creates new form ChatPanel */ /**
* Creates new form ChatPanel
*/
public ChatPanel() { public ChatPanel() {
this(false); this(false);
} }
@ -138,7 +143,9 @@ public class ChatPanel extends javax.swing.JPanel {
/** /**
* @param addPlayersTab if true, adds chat/players tabs * @param addPlayersTab if true, adds chat/players tabs
*/ */
/** Creates new form ChatPanel */ /**
* Creates new form ChatPanel
*/
public ChatPanel(boolean addPlayersTab) { public ChatPanel(boolean addPlayersTab) {
tableModel = new TableModel(); tableModel = new TableModel();
initComponents(); initComponents();
@ -174,7 +181,6 @@ public class ChatPanel extends javax.swing.JPanel {
this.startMessageDone = startMessageDone; this.startMessageDone = startMessageDone;
} }
public void connect(UUID chatId) { public void connect(UUID chatId) {
session = MageFrame.getSession(); session = MageFrame.getSession();
this.chatId = chatId; this.chatId = chatId;
@ -190,38 +196,50 @@ public class ChatPanel extends javax.swing.JPanel {
} }
/** /**
* Display message in the chat. * Display message in the chat. Use different colors for timestamp, username
* Use different colors for timestamp, username and message. * and message.
* *
* @param username message sender * @param username message sender
* @param message message itself * @param message message itself
* @param time timestamp * @param time timestamp
* @param color Preferred color. Not used. * @param color Preferred color. Not used.
*/ */
public void receiveMessage(String username, String message, String time, MessageColor color) { public void receiveMessage(String username, String message, String time, MessageType messageType, MessageColor color) {
if (extendedViewMode.equals(VIEW_MODE.GAME)) { if (time != null) {
this.txtConversation.append(TIMESTAMP_COLOR, time + " "); this.txtConversation.append(TIMESTAMP_COLOR, time + " ");
Color textColor = MESSAGE_COLOR;
if (color.equals(MessageColor.ORANGE)) {
textColor = Color.ORANGE;
}
this.txtConversation.append(textColor, (username.isEmpty() ? "" : username + ":") + message + "\n");
} else {
this.txtConversation.append(TIMESTAMP_COLOR, time + " ");
Color userColor;
Color textColor = MESSAGE_COLOR;
if (parentChatRef != null) {
userColor = parentChatRef.session.getUserName().equals(username) ? MY_COLOR : OPPONENT_COLOR;
} else {
userColor = session.getUserName().equals(username) ? MY_COLOR : OPPONENT_COLOR;
if (color.equals(MessageColor.ORANGE)) {
userColor = Color.ORANGE;
textColor = userColor;
}
}
this.txtConversation.append(userColor, username + ": ");
this.txtConversation.append(textColor, message + "\n");
} }
Color userColor;
Color textColor;
String userSeparator = " ";
switch (messageType) {
case STATUS: // a message to all chat user
textColor = STATUS_COLOR;
userColor = STATUS_COLOR;
break;
case USER_INFO: // a personal message
textColor = USER_INFO_COLOR;
userColor = USER_INFO_COLOR;
break;
default:
if (parentChatRef != null) {
userColor = parentChatRef.session.getUserName().equals(username) ? MY_COLOR : OPPONENT_COLOR;
} else {
userColor = session.getUserName().equals(username) ? MY_COLOR : OPPONENT_COLOR;
}
textColor = MESSAGE_COLOR;
userSeparator = ": ";
}
if (color.equals(MessageColor.ORANGE)) {
textColor = Color.ORANGE;
}
if (color.equals(MessageColor.YELLOW)) {
textColor = Color.YELLOW;
}
if (username != null && !username.isEmpty()) {
this.txtConversation.append(userColor, username);
this.txtConversation.append(userColor, userSeparator);
}
this.txtConversation.append(textColor, message + "\n");
} }
public String getText() { public String getText() {
@ -258,16 +276,16 @@ public class ChatPanel extends javax.swing.JPanel {
public void useExtendedView(VIEW_MODE extendedViewMode) { public void useExtendedView(VIEW_MODE extendedViewMode) {
this.extendedViewMode = extendedViewMode; this.extendedViewMode = extendedViewMode;
this.txtConversation.setExtBackgroundColor(new Color(0,0,0,100)); this.txtConversation.setExtBackgroundColor(new Color(0, 0, 0, 100));
this.txtConversation.setBackground(new Color(0,0,0,0)); this.txtConversation.setBackground(new Color(0, 0, 0, 0));
this.txtConversation.setForeground(new Color(255,255,255)); this.txtConversation.setForeground(new Color(255, 255, 255));
this.jScrollPaneTxt.setOpaque(false); this.jScrollPaneTxt.setOpaque(false);
this.jScrollPaneTxt.getViewport().setOpaque(false); this.jScrollPaneTxt.getViewport().setOpaque(false);
} }
public void setSplitDividerLocation(int location) { public void setSplitDividerLocation(int location) {
if (jSplitPane1 != null) { if (jSplitPane1 != null) {
jSplitPane1.setDividerLocation(location); jSplitPane1.setDividerLocation(location);
} }
} }
@ -278,66 +296,74 @@ public class ChatPanel extends javax.swing.JPanel {
return this.jSplitPane1.getDividerLocation(); return this.jSplitPane1.getDividerLocation();
} }
class TableModel extends AbstractTableModel { class TableModel extends AbstractTableModel {
private String[] columnNames = new String[]{"Players"};
private List<String> players = new ArrayList<String>(0);
public void loadData(List<String> players) { private String[] columnNames = new String[]{"Players", "Info", "Games"};
this.players = players; private UsersView[] players = new UsersView[0];
JTableHeader th = jTablePlayers.getTableHeader();
TableColumnModel tcm = th.getColumnModel();
TableColumn tc = tcm.getColumn(0);
tc.setHeaderValue(new StringBuilder("Players").append(" (").append(this.players.size()).append(")").toString());
th.repaint();
this.fireTableDataChanged();
}
@Override public void loadData(Collection<UsersView> players) throws MageRemoteException {
public int getRowCount() { this.players = players.toArray(new UsersView[0]);
return players.size(); JTableHeader th = jTablePlayers.getTableHeader();
} TableColumnModel tcm = th.getColumnModel();
TableColumn tc = tcm.getColumn(0);
@Override tc.setHeaderValue(new StringBuilder("Players").append(" (").append(this.players.length).append(")").toString());
public int getColumnCount() { th.repaint();
return columnNames.length; this.fireTableDataChanged();
}
@Override
public Object getValueAt(int arg0, int arg1) {
return players.get(arg0);
}
@Override
public String getColumnName(int columnIndex) {
String colName = "";
if (columnIndex <= getColumnCount()) {
colName = columnNames[columnIndex];
} }
return colName; @Override
} public int getRowCount() {
return players.length;
}
@Override @Override
public Class getColumnClass(int columnIndex){ public int getColumnCount() {
return String.class; return columnNames.length;
} }
@Override @Override
public boolean isCellEditable(int rowIndex, int columnIndex) { public Object getValueAt(int arg0, int arg1) {
return false; switch (arg1) {
} case 0:
return players[arg0].getUserName();
case 1:
return players[arg0].getInfoState();
case 2:
return players[arg0].getInfoGames();
}
return "";
}
} @Override
public String getColumnName(int columnIndex) {
String colName = "";
if (columnIndex <= getColumnCount()) {
colName = columnNames[columnIndex];
}
return colName;
}
@Override
public Class getColumnClass(int columnIndex) {
return String.class;
}
@Override
public boolean isCellEditable(int rowIndex, int columnIndex) {
return false;
}
}
public void clear() { public void clear() {
this.txtConversation.setText(""); this.txtConversation.setText("");
} }
/** This method is called from within the constructor to /**
* initialize the form. * This method is called from within the constructor to initialize the form.
* WARNING: Do NOT modify this code. The content of this method is * WARNING: Do NOT modify this code. The content of this method is always
* always regenerated by the Form Editor. * regenerated by the Form Editor.
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
@ -395,17 +421,15 @@ class TableModel extends AbstractTableModel {
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout); this.setLayout(layout);
layout.setHorizontalGroup( layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(txtMessage, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 168, Short.MAX_VALUE) .addComponent(txtMessage, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 168, Short.MAX_VALUE)
.addComponent(jScrollPaneTxt, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 168, Short.MAX_VALUE) .addComponent(jScrollPaneTxt, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 168, Short.MAX_VALUE));
);
layout.setVerticalGroup( layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
.addComponent(jScrollPaneTxt, javax.swing.GroupLayout.DEFAULT_SIZE, 294, Short.MAX_VALUE) .addComponent(jScrollPaneTxt, javax.swing.GroupLayout.DEFAULT_SIZE, 294, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(txtMessage, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(txtMessage, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE)));
);
jTablePlayers = null; jTablePlayers = null;
jScrollPanePlayers = null; jScrollPanePlayers = null;
} }
@ -422,35 +446,42 @@ class TableModel extends AbstractTableModel {
} }
}//GEN-LAST:event_txtMessageKeyTyped }//GEN-LAST:event_txtMessageKeyTyped
public void setPlayers(Collection<String> players) { // public void setPlayers(Collection<String> players) {
if (players != null) { public void setPlayers(List<Collection<UsersView>> view) {
boolean update; try {
int size = players.size(); // TODO: sort by user name
List<String> list = new ArrayList<String>(players); tableModel.loadData(view.get(0));
Collections.sort(list, String.CASE_INSENSITIVE_ORDER); } catch (Exception ex) {
if (size != this.players.size()) {
update = true;
} else {
update = false;
for (int i = 0; i < size; i++) {
if (!list.get(i).equals(this.players.get(i))) {
update = true;
break;
}
}
}
if (update) {
synchronized (tableModel) {
this.players = list;
tableModel.loadData(this.players);
}
}
} else {
this.players.clear(); this.players.clear();
} }
}
// if (players != null) {
// boolean update;
// int size = players.size();
// List<String> list = new ArrayList<String>(players);
// Collections.sort(list, String.CASE_INSENSITIVE_ORDER);
// if (size != this.players.size()) {
// update = true;
// } else {
// update = false;
// for (int i = 0; i < size; i++) {
// if (!list.get(i).equals(this.players.get(i))) {
// update = true;
// break;
// }
// }
// }
// if (update) {
// synchronized (tableModel) {
// this.players = list;
// tableModel.loadData(this.players);
// }
// }
//
// } else {
// this.players.clear();
// }
}
// Variables declaration - do not modify//GEN-BEGIN:variables // Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JScrollPane jScrollPanePlayers; private javax.swing.JScrollPane jScrollPanePlayers;
private javax.swing.JScrollPane jScrollPaneTxt; private javax.swing.JScrollPane jScrollPaneTxt;
@ -459,5 +490,4 @@ class TableModel extends AbstractTableModel {
private mage.client.components.ColorPane txtConversation; private mage.client.components.ColorPane txtConversation;
private javax.swing.JTextField txtMessage; private javax.swing.JTextField txtMessage;
// End of variables declaration//GEN-END:variables // End of variables declaration//GEN-END:variables
} }

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

@ -1,34 +1,32 @@
/* /*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without modification, are * Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met: * permitted provided that the following conditions are met:
* *
* 1. Redistributions of source code must retain the above copyright notice, this list of * 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer. * conditions and the following disclaimer.
* *
* 2. Redistributions in binary form must reproduce the above copyright notice, this list * 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 * of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution. * provided with the distribution.
* *
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED * 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 * 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 * 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 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 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 * 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 * 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 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* The views and conclusions contained in the software and documentation are those of the * 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 * authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com. * or implied, of BetaSteward_at_googlemail.com.
*/ */
package mage.client.remote; package mage.client.remote;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
@ -49,6 +47,7 @@ import mage.interfaces.callback.ClientCallback;
import mage.utils.CompressUtil; import mage.utils.CompressUtil;
import mage.view.AbilityPickerView; import mage.view.AbilityPickerView;
import mage.view.ChatMessage; import mage.view.ChatMessage;
import mage.view.ChatMessage.MessageType;
import mage.view.DeckView; import mage.view.DeckView;
import mage.view.DraftClientMessage; import mage.view.DraftClientMessage;
import mage.view.DraftView; import mage.view.DraftView;
@ -58,7 +57,6 @@ import mage.view.GameView;
import mage.view.TableClientMessage; import mage.view.TableClientMessage;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
/** /**
* *
* @author BetaSteward_at_googlemail.com * @author BetaSteward_at_googlemail.com
@ -66,7 +64,6 @@ import org.apache.log4j.Logger;
public class CallbackClientImpl implements CallbackClient { public class CallbackClientImpl implements CallbackClient {
private static final Logger logger = Logger.getLogger(CallbackClientImpl.class); private static final Logger logger = Logger.getLogger(CallbackClientImpl.class);
private UUID clientId; private UUID clientId;
private MageFrame frame; private MageFrame frame;
private int messageId = 0; private int messageId = 0;
@ -92,25 +89,19 @@ public class CallbackClientImpl implements CallbackClient {
TableClientMessage message = (TableClientMessage) callback.getData(); TableClientMessage message = (TableClientMessage) callback.getData();
GameManager.getInstance().setCurrentPlayerUUID(message.getPlayerId()); GameManager.getInstance().setCurrentPlayerUUID(message.getPlayerId());
gameStarted(message.getGameId(), message.getPlayerId()); gameStarted(message.getGameId(), message.getPlayerId());
} } else if (callback.getMethod().equals("startTournament")) {
else if(callback.getMethod().equals("startTournament")) {
TableClientMessage message = (TableClientMessage) callback.getData(); TableClientMessage message = (TableClientMessage) callback.getData();
tournamentStarted(message.getGameId(), message.getPlayerId()); tournamentStarted(message.getGameId(), message.getPlayerId());
} } else if (callback.getMethod().equals("startDraft")) {
else if(callback.getMethod().equals("startDraft")) {
TableClientMessage message = (TableClientMessage) callback.getData(); TableClientMessage message = (TableClientMessage) callback.getData();
draftStarted(message.getGameId(), message.getPlayerId()); draftStarted(message.getGameId(), message.getPlayerId());
} } else if (callback.getMethod().equals("replayGame")) {
else if (callback.getMethod().equals("replayGame")) {
replayGame(callback.getObjectId()); replayGame(callback.getObjectId());
} } else if (callback.getMethod().equals("showTournament")) {
else if (callback.getMethod().equals("showTournament")) {
showTournament((UUID) callback.getObjectId()); showTournament((UUID) callback.getObjectId());
} } else if (callback.getMethod().equals("watchGame")) {
else if (callback.getMethod().equals("watchGame")) {
watchGame((UUID) callback.getObjectId()); watchGame((UUID) callback.getObjectId());
} } else if (callback.getMethod().equals("chatMessage")) {
else if (callback.getMethod().equals("chatMessage")) {
ChatMessage message = (ChatMessage) callback.getData(); ChatMessage message = (ChatMessage) callback.getData();
ChatPanel panel = MageFrame.getChat(callback.getObjectId()); ChatPanel panel = MageFrame.getChat(callback.getObjectId());
if (panel != null) { if (panel != null) {
@ -120,20 +111,23 @@ public class CallbackClientImpl implements CallbackClient {
case PlayerLeft: case PlayerLeft:
AudioManager.playPlayerLeft(); AudioManager.playPlayerLeft();
break; break;
case PlayerSubmittedDeck: case PlayerSubmittedDeck:
AudioManager.playPlayerSubmittedDeck(); AudioManager.playPlayerSubmittedDeck();
break; break;
case PlayerWhispered:
AudioManager.playPlayerWhispered();
break;
} }
} }
// send start message to chat if needed // send start message to chat if not done yet
if (!panel.isStartMessageDone()) { if (!panel.isStartMessageDone()) {
createChatStartMessage(panel); createChatStartMessage(panel);
} }
// send the message itself // send the message to subchat if exists and it's not a game message
if (message.isUserMessage() && panel.getConnectedChat() != null) { if (!message.getMessageType().equals(MessageType.GAME) && panel.getConnectedChat() != null) {
panel.getConnectedChat().receiveMessage(message.getUsername(), message.getMessage(), message.getTime(), ChatMessage.MessageColor.BLACK); panel.getConnectedChat().receiveMessage(message.getUsername(), message.getMessage(), message.getTime(), message.getMessageType(), ChatMessage.MessageColor.BLACK);
} else { } else {
panel.receiveMessage(message.getUsername(), message.getMessage(), message.getTime(), message.getColor()); panel.receiveMessage(message.getUsername(), message.getMessage(), message.getTime(), message.getMessageType(), message.getColor());
} }
} }
@ -149,119 +143,100 @@ public class CallbackClientImpl implements CallbackClient {
} else if (callback.getMethod().equals("joinedTable")) { } else if (callback.getMethod().equals("joinedTable")) {
TableClientMessage message = (TableClientMessage) callback.getData(); TableClientMessage message = (TableClientMessage) callback.getData();
joinedTable(message.getRoomId(), message.getTableId(), message.getFlag()); joinedTable(message.getRoomId(), message.getTableId(), message.getFlag());
} } else if (callback.getMethod().equals("replayInit")) {
else if (callback.getMethod().equals("replayInit")) {
GamePanel panel = MageFrame.getGame(callback.getObjectId()); GamePanel panel = MageFrame.getGame(callback.getObjectId());
if (panel != null) { if (panel != null) {
panel.init((GameView) callback.getData()); panel.init((GameView) callback.getData());
} }
} } else if (callback.getMethod().equals("replayDone")) {
else if (callback.getMethod().equals("replayDone")) {
GamePanel panel = MageFrame.getGame(callback.getObjectId()); GamePanel panel = MageFrame.getGame(callback.getObjectId());
if (panel != null) { if (panel != null) {
panel.endMessage((String) callback.getData(), callback.getMessageId()); panel.endMessage((String) callback.getData(), callback.getMessageId());
} }
} } else if (callback.getMethod().equals("replayUpdate")) {
else if (callback.getMethod().equals("replayUpdate")) {
GamePanel panel = MageFrame.getGame(callback.getObjectId()); GamePanel panel = MageFrame.getGame(callback.getObjectId());
if (panel != null) { if (panel != null) {
panel.updateGame((GameView) callback.getData()); panel.updateGame((GameView) callback.getData());
} }
} } else if (callback.getMethod().equals("gameInit")) {
else if (callback.getMethod().equals("gameInit")) {
GamePanel panel = MageFrame.getGame(callback.getObjectId()); GamePanel panel = MageFrame.getGame(callback.getObjectId());
if (panel != null) { if (panel != null) {
panel.init((GameView) callback.getData()); panel.init((GameView) callback.getData());
} }
} } else if (callback.getMethod().equals("gameOver")) {
else if (callback.getMethod().equals("gameOver")) {
GamePanel panel = MageFrame.getGame(callback.getObjectId()); GamePanel panel = MageFrame.getGame(callback.getObjectId());
if (panel != null) { if (panel != null) {
panel.endMessage((String) callback.getData(), callback.getMessageId()); panel.endMessage((String) callback.getData(), callback.getMessageId());
} }
} } else if (callback.getMethod().equals("gameError")) {
else if (callback.getMethod().equals("gameError")) {
frame.showErrorDialog("Game Error", (String) callback.getData()); frame.showErrorDialog("Game Error", (String) callback.getData());
} } else if (callback.getMethod().equals("gameAsk")) {
else if (callback.getMethod().equals("gameAsk")) {
GameClientMessage message = (GameClientMessage) callback.getData(); GameClientMessage message = (GameClientMessage) callback.getData();
GamePanel panel = MageFrame.getGame(callback.getObjectId()); GamePanel panel = MageFrame.getGame(callback.getObjectId());
if (panel != null) { if (panel != null) {
panel.ask(message.getMessage(), message.getGameView(), callback.getMessageId()); panel.ask(message.getMessage(), message.getGameView(), callback.getMessageId());
} }
} } else if (callback.getMethod().equals("gameTarget")) {
else if (callback.getMethod().equals("gameTarget")) {
GameClientMessage message = (GameClientMessage) callback.getData(); GameClientMessage message = (GameClientMessage) callback.getData();
GamePanel panel = MageFrame.getGame(callback.getObjectId()); GamePanel panel = MageFrame.getGame(callback.getObjectId());
if (panel != null) { if (panel != null) {
panel.pickTarget(message.getMessage(), message.getCardsView(), message.getGameView(), panel.pickTarget(message.getMessage(), message.getCardsView(), message.getGameView(),
message.getTargets(), message.isFlag(), message.getOptions(), callback.getMessageId()); message.getTargets(), message.isFlag(), message.getOptions(), callback.getMessageId());
} }
} } else if (callback.getMethod().equals("gameSelect")) {
else if (callback.getMethod().equals("gameSelect")) {
GameClientMessage message = (GameClientMessage) callback.getData(); GameClientMessage message = (GameClientMessage) callback.getData();
GamePanel panel = MageFrame.getGame(callback.getObjectId()); GamePanel panel = MageFrame.getGame(callback.getObjectId());
if (panel != null) { if (panel != null) {
panel.select(message.getMessage(), message.getGameView(), callback.getMessageId()); panel.select(message.getMessage(), message.getGameView(), callback.getMessageId());
} }
} } else if (callback.getMethod().equals("gameChooseAbility")) {
else if (callback.getMethod().equals("gameChooseAbility")) {
GamePanel panel = MageFrame.getGame(callback.getObjectId()); GamePanel panel = MageFrame.getGame(callback.getObjectId());
if (panel != null) { if (panel != null) {
panel.pickAbility((AbilityPickerView) callback.getData()); panel.pickAbility((AbilityPickerView) callback.getData());
} }
} } else if (callback.getMethod().equals("gameChoosePile")) {
else if (callback.getMethod().equals("gameChoosePile")) {
GameClientMessage message = (GameClientMessage) callback.getData(); GameClientMessage message = (GameClientMessage) callback.getData();
GamePanel panel = MageFrame.getGame(callback.getObjectId()); GamePanel panel = MageFrame.getGame(callback.getObjectId());
if (panel != null) { if (panel != null) {
panel.pickPile(message.getMessage(), message.getPile1(), message.getPile2()); panel.pickPile(message.getMessage(), message.getPile1(), message.getPile2());
} }
} } else if (callback.getMethod().equals("gameChoose")) {
else if (callback.getMethod().equals("gameChoose")) {
GameClientMessage message = (GameClientMessage) callback.getData(); GameClientMessage message = (GameClientMessage) callback.getData();
GamePanel panel = MageFrame.getGame(callback.getObjectId()); GamePanel panel = MageFrame.getGame(callback.getObjectId());
if (panel != null) { if (panel != null) {
panel.getChoice(message.getMessage(), message.getStrings()); panel.getChoice(message.getMessage(), message.getStrings());
} }
} } else if (callback.getMethod().equals("gamePlayMana")) {
else if (callback.getMethod().equals("gamePlayMana")) {
GameClientMessage message = (GameClientMessage) callback.getData(); GameClientMessage message = (GameClientMessage) callback.getData();
GamePanel panel = MageFrame.getGame(callback.getObjectId()); GamePanel panel = MageFrame.getGame(callback.getObjectId());
if (panel != null) { if (panel != null) {
panel.playMana(message.getMessage(), message.getGameView(), callback.getMessageId()); panel.playMana(message.getMessage(), message.getGameView(), callback.getMessageId());
} }
} } else if (callback.getMethod().equals("gamePlayXMana")) {
else if (callback.getMethod().equals("gamePlayXMana")) {
GameClientMessage message = (GameClientMessage) callback.getData(); GameClientMessage message = (GameClientMessage) callback.getData();
GamePanel panel = MageFrame.getGame(callback.getObjectId()); GamePanel panel = MageFrame.getGame(callback.getObjectId());
if (panel != null) { if (panel != null) {
panel.playXMana(message.getMessage(), message.getGameView(), callback.getMessageId()); panel.playXMana(message.getMessage(), message.getGameView(), callback.getMessageId());
} }
} } else if (callback.getMethod().equals("gameSelectAmount")) {
else if (callback.getMethod().equals("gameSelectAmount")) {
GameClientMessage message = (GameClientMessage) callback.getData(); GameClientMessage message = (GameClientMessage) callback.getData();
GamePanel panel = MageFrame.getGame(callback.getObjectId()); GamePanel panel = MageFrame.getGame(callback.getObjectId());
if (panel != null) { if (panel != null) {
panel.getAmount(message.getMin(), message.getMax(), message.getMessage()); panel.getAmount(message.getMin(), message.getMax(), message.getMessage());
} }
} } else if (callback.getMethod().equals("gameUpdate")) {
else if (callback.getMethod().equals("gameUpdate")) {
GamePanel panel = MageFrame.getGame(callback.getObjectId()); GamePanel panel = MageFrame.getGame(callback.getObjectId());
if (panel != null) { if (panel != null) {
panel.updateGame((GameView) callback.getData()); panel.updateGame((GameView) callback.getData());
} }
} } else if (callback.getMethod().equals("endGameInfo")) {
else if (callback.getMethod().equals("endGameInfo")) {
MageFrame.getInstance().showGameEndDialog((GameEndView) callback.getData()); MageFrame.getInstance().showGameEndDialog((GameEndView) callback.getData());
} } else if (callback.getMethod().equals("showUserMessage")) {
else if (callback.getMethod().equals("showUserMessage")) {
List<String> messageData = (List<String>) callback.getData(); List<String> messageData = (List<String>) callback.getData();
if (messageData.size() == 2) { if (messageData.size() == 2) {
JOptionPane.showMessageDialog(null, messageData.get(1), messageData.get(0), JOptionPane.WARNING_MESSAGE); JOptionPane.showMessageDialog(null, messageData.get(1), messageData.get(0), JOptionPane.WARNING_MESSAGE);
} }
} } else if (callback.getMethod().equals("gameInform")) {
else if (callback.getMethod().equals("gameInform")) {
if (callback.getMessageId() > messageId) { if (callback.getMessageId() > messageId) {
GameClientMessage message = (GameClientMessage) callback.getData(); GameClientMessage message = (GameClientMessage) callback.getData();
@ -269,76 +244,62 @@ public class CallbackClientImpl implements CallbackClient {
if (panel != null) { if (panel != null) {
panel.inform(message.getMessage(), message.getGameView(), callback.getMessageId()); panel.inform(message.getMessage(), message.getGameView(), callback.getMessageId());
} }
} } else {
else {
logger.warn("message out of sequence - ignoring"); logger.warn("message out of sequence - ignoring");
} }
} } else if (callback.getMethod().equals("gameInformPersonal")) {
else if (callback.getMethod().equals("gameInformPersonal")) {
GameClientMessage message = (GameClientMessage) callback.getData(); GameClientMessage message = (GameClientMessage) callback.getData();
GamePanel panel = MageFrame.getGame(callback.getObjectId()); GamePanel panel = MageFrame.getGame(callback.getObjectId());
if (panel != null) { if (panel != null) {
JOptionPane.showMessageDialog(panel, message.getMessage(), "Game message", JOptionPane.showMessageDialog(panel, message.getMessage(), "Game message",
JOptionPane.INFORMATION_MESSAGE); JOptionPane.INFORMATION_MESSAGE);
} }
} } else if (callback.getMethod().equals("sideboard")) {
else if (callback.getMethod().equals("sideboard")) {
TableClientMessage message = (TableClientMessage) callback.getData(); TableClientMessage message = (TableClientMessage) callback.getData();
DeckView deckView = message.getDeck(); DeckView deckView = message.getDeck();
Deck deck = DeckUtil.construct(deckView); Deck deck = DeckUtil.construct(deckView);
if (message.getFlag()) { if (message.getFlag()) {
construct(deck, message.getTableId(), message.getTime()); construct(deck, message.getTableId(), message.getTime());
} } else {
else {
sideboard(deck, message.getTableId(), message.getTime()); sideboard(deck, message.getTableId(), message.getTime());
} }
} } else if (callback.getMethod().equals("construct")) {
else if (callback.getMethod().equals("construct")) {
TableClientMessage message = (TableClientMessage) callback.getData(); TableClientMessage message = (TableClientMessage) callback.getData();
DeckView deckView = message.getDeck(); DeckView deckView = message.getDeck();
Deck deck = DeckUtil.construct(deckView); Deck deck = DeckUtil.construct(deckView);
construct(deck, message.getTableId(), message.getTime()); construct(deck, message.getTableId(), message.getTime());
} } else if (callback.getMethod().equals("draftOver")) {
else if (callback.getMethod().equals("draftOver")) {
DraftPanel panel = MageFrame.getDraft(callback.getObjectId()); DraftPanel panel = MageFrame.getDraft(callback.getObjectId());
if (panel != null) { if (panel != null) {
panel.hideDraft(); panel.hideDraft();
} }
} } else if (callback.getMethod().equals("draftPick")) {
else if (callback.getMethod().equals("draftPick")) {
DraftClientMessage message = (DraftClientMessage) callback.getData(); DraftClientMessage message = (DraftClientMessage) callback.getData();
DraftPanel panel = MageFrame.getDraft(callback.getObjectId()); DraftPanel panel = MageFrame.getDraft(callback.getObjectId());
if (panel != null) { if (panel != null) {
panel.loadBooster(message.getDraftPickView()); panel.loadBooster(message.getDraftPickView());
} }
} } else if (callback.getMethod().equals("draftUpdate")) {
else if (callback.getMethod().equals("draftUpdate")) {
DraftPanel panel = MageFrame.getDraft(callback.getObjectId()); DraftPanel panel = MageFrame.getDraft(callback.getObjectId());
if (panel != null) { if (panel != null) {
panel.updateDraft((DraftView) callback.getData()); panel.updateDraft((DraftView) callback.getData());
} }
} } else if (callback.getMethod().equals("draftInform")) {
else if (callback.getMethod().equals("draftInform")) {
if (callback.getMessageId() > messageId) { if (callback.getMessageId() > messageId) {
DraftClientMessage message = (DraftClientMessage) callback.getData(); DraftClientMessage message = (DraftClientMessage) callback.getData();
} } else {
else {
logger.warn("message out of sequence - ignoring"); logger.warn("message out of sequence - ignoring");
} }
} } else if (callback.getMethod().equals("draftInit")) {
else if (callback.getMethod().equals("draftInit")) {
DraftClientMessage message = (DraftClientMessage) callback.getData(); DraftClientMessage message = (DraftClientMessage) callback.getData();
DraftPanel panel = MageFrame.getDraft(callback.getObjectId()); DraftPanel panel = MageFrame.getDraft(callback.getObjectId());
if (panel != null) { if (panel != null) {
panel.loadBooster(message.getDraftPickView()); panel.loadBooster(message.getDraftPickView());
} }
} } else if (callback.getMethod().equals("tournamentInit")) {
else if (callback.getMethod().equals("tournamentInit")) {
} }
messageId = callback.getMessageId(); messageId = callback.getMessageId();
} } catch (Exception ex) {
catch (Exception ex) {
handleException(ex); handleException(ex);
} }
} }
@ -353,21 +314,23 @@ public class CallbackClientImpl implements CallbackClient {
} }
switch (usedPanel.getChatType()) { switch (usedPanel.getChatType()) {
case GAME: case GAME:
usedPanel.receiveMessage("", "You may use hot keys to play faster: " + "" + usedPanel.receiveMessage("", new StringBuilder("You may use hot keys to play faster:")
"\nTurn Mousewheel - Show big image of card your mousepointer hovers over" + .append("\nTurn Mousewheel - Show big image of card your mousepointer hovers over")
"\nF2 - Confirm \"Ok\", \"Yes\" or \"Done\" button" + .append("\nF2 - Confirm \"Ok\", \"Yes\" or \"Done\" button")
"\nF4 - Skip current turn but stop on declare attackers" + .append("\nF4 - Skip current turn but stop on declare attackers/blockers and something on the stack")
"\nF9 - Skip everything until your next turn" + .append("\nF9 - Skip everything until your next turn")
"\nF3 - Undo F4/F9", "", ChatMessage.MessageColor.ORANGE); .append("\nF3 - Undo F4/F9").toString(),
null, MessageType.USER_INFO, ChatMessage.MessageColor.ORANGE);
break; break;
case TOURNAMENT: case TOURNAMENT:
usedPanel.receiveMessage("", "On this panel you can see the players, their state and the results of the games of the tournament. Also you can chat with the competitors of the tournament.", "", ChatMessage.MessageColor.ORANGE); usedPanel.receiveMessage("", new StringBuilder("On this panel you can see the players, their state and the results of the games of the tournament. Also you can chat with the competitors of the tournament.").toString(),
null, MessageType.USER_INFO, ChatMessage.MessageColor.ORANGE);
break; break;
case TABLES: case TABLES:
usedPanel.receiveMessage("", usedPanel.receiveMessage("", new StringBuilder("Download card images by using the \"Images\" menu to the top right .")
"Download card images by using the \"Images\" menu to the top right ." + .append("\nDownload icons and symbols by using the \"Symbols\" menu to the top right.")
"\nDownload icons and symbols by using the \"Symbols\" menu to the top right.", .append("\n\\list - Show a list of available chat commands.").toString(),
"", ChatMessage.MessageColor.ORANGE); null, MessageType.USER_INFO, ChatMessage.MessageColor.ORANGE);
break; break;
} }
@ -380,18 +343,16 @@ public class CallbackClientImpl implements CallbackClient {
private void joinedTable(UUID roomId, UUID tableId, boolean isTournament) { private void joinedTable(UUID roomId, UUID tableId, boolean isTournament) {
try { try {
frame.showTableWaitingDialog(roomId, tableId, isTournament); frame.showTableWaitingDialog(roomId, tableId, isTournament);
} } catch (Exception ex) {
catch (Exception ex) {
handleException(ex); handleException(ex);
} }
} }
protected void gameStarted(final UUID gameId, final UUID playerId) { protected void gameStarted(final UUID gameId, final UUID playerId) {
try { try {
frame.showGame(gameId, playerId); frame.showGame(gameId, playerId);
logger.info("Game " + gameId + " started for player " + playerId); logger.info("Game " + gameId + " started for player " + playerId);
} } catch (Exception ex) {
catch (Exception ex) {
handleException(ex); handleException(ex);
} }
@ -404,8 +365,7 @@ public class CallbackClientImpl implements CallbackClient {
try { try {
frame.showDraft(draftId); frame.showDraft(draftId);
logger.info("Draft " + draftId + " started for player " + playerId); logger.info("Draft " + draftId + " started for player " + playerId);
} } catch (Exception ex) {
catch (Exception ex) {
handleException(ex); handleException(ex);
} }
} }
@ -414,8 +374,7 @@ public class CallbackClientImpl implements CallbackClient {
try { try {
frame.showTournament(tournamentId); frame.showTournament(tournamentId);
logger.info("Tournament " + tournamentId + " started for player " + playerId); logger.info("Tournament " + tournamentId + " started for player " + playerId);
} } catch (Exception ex) {
catch (Exception ex) {
handleException(ex); handleException(ex);
} }
} }
@ -429,8 +388,7 @@ public class CallbackClientImpl implements CallbackClient {
try { try {
frame.showTournament(tournamentId); frame.showTournament(tournamentId);
logger.info("Showing tournament " + tournamentId); logger.info("Showing tournament " + tournamentId);
} } catch (Exception ex) {
catch (Exception ex) {
handleException(ex); handleException(ex);
} }
} }
@ -439,17 +397,16 @@ public class CallbackClientImpl implements CallbackClient {
try { try {
frame.watchGame(gameId); frame.watchGame(gameId);
logger.info("Watching game " + gameId); logger.info("Watching game " + gameId);
} } catch (Exception ex) {
catch (Exception ex) {
handleException(ex); handleException(ex);
} }
} }
protected void replayGame(UUID gameId) { protected void replayGame(UUID gameId) {
try { try {
frame.replayGame(gameId); frame.replayGame(gameId);
logger.info("Replaying game"); logger.info("Replaying game");
} } catch (Exception ex) {
catch (Exception ex) {
handleException(ex); handleException(ex);
} }
} }
@ -466,5 +423,4 @@ public class CallbackClientImpl implements CallbackClient {
logger.fatal("Client error\n", ex); logger.fatal("Client error\n", ex);
frame.showError("Error: " + ex.getMessage()); frame.showError("Error: " + ex.getMessage());
} }
} }

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

@ -28,12 +28,12 @@
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<Component id="jPanel1" min="-2" max="-2" attributes="0"/> <Component id="jPanel1" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="0" max="-2" attributes="0"/> <EmptySpace min="-2" pref="0" max="-2" attributes="0"/>
<Component id="jSplitPane1" pref="505" max="32767" attributes="0"/> <Component id="jSplitPane1" max="32767" attributes="0"/>
<EmptySpace min="-2" pref="0" max="-2" attributes="0"/> <EmptySpace min="-2" pref="0" max="-2" attributes="0"/>
<Component id="jPanel2" min="-2" pref="25" max="-2" attributes="0"/> <Component id="jPanel2" min="-2" pref="25" max="-2" attributes="0"/>
</Group> </Group>
<Group type="103" rootIndex="1" groupAlignment="0" attributes="0"> <Group type="103" rootIndex="1" groupAlignment="0" attributes="0">
<EmptySpace min="0" pref="580" max="32767" attributes="0"/> <EmptySpace min="0" pref="584" max="32767" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
@ -128,7 +128,7 @@
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="jLabel1" min="-2" max="-2" attributes="0"/> <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="jLabel2" pref="705" max="32767" attributes="0"/> <Component id="jLabel2" pref="701" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>

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

@ -79,6 +79,7 @@ import mage.remote.MageRemoteException;
import mage.remote.Session; import mage.remote.Session;
import mage.view.MatchView; import mage.view.MatchView;
import mage.view.TableView; import mage.view.TableView;
import mage.view.UsersView;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
/** /**
@ -827,7 +828,7 @@ class UpdateTablesTask extends SwingWorker<Void, Collection<TableView>> {
} }
class UpdatePlayersTask extends SwingWorker<Void, Collection<String>> { class UpdatePlayersTask extends SwingWorker<Void, Collection<UsersView>> {
private Session session; private Session session;
private UUID roomId; private UUID roomId;
@ -851,8 +852,8 @@ class UpdatePlayersTask extends SwingWorker<Void, Collection<String>> {
} }
@Override @Override
protected void process(List<Collection<String>> players) { protected void process(List<Collection<UsersView>> players) {
chat.setPlayers(players.get(0)); chat.setPlayers(players);
} }
@Override @Override

6
Mage.Client/src/main/java/mage/client/util/AudioManager.java
View file

@ -48,6 +48,7 @@ public class AudioManager {
audioManager.playerJoinedTable = audioManager.loadClip(Constants.BASE_SOUND_PATH + "OnPlayerJoinedTable.wav"); audioManager.playerJoinedTable = audioManager.loadClip(Constants.BASE_SOUND_PATH + "OnPlayerJoinedTable.wav");
audioManager.playerSubmittedDeck = audioManager.loadClip(Constants.BASE_SOUND_PATH + "OnPlayerSubmittedDeck.wav"); audioManager.playerSubmittedDeck = audioManager.loadClip(Constants.BASE_SOUND_PATH + "OnPlayerSubmittedDeck.wav");
audioManager.playerWhispered = audioManager.loadClip(Constants.BASE_SOUND_PATH + "OnPlayerWhispered.wav");
audioManager.playerLeft = audioManager.loadClip(Constants.BASE_SOUND_PATH + "OnPlayerLeft.wav"); audioManager.playerLeft = audioManager.loadClip(Constants.BASE_SOUND_PATH + "OnPlayerLeft.wav");
audioManager.playerWon = audioManager.loadClip(Constants.BASE_SOUND_PATH + "OnPlayerWon.wav"); audioManager.playerWon = audioManager.loadClip(Constants.BASE_SOUND_PATH + "OnPlayerWon.wav");
audioManager.playerLost = audioManager.loadClip(Constants.BASE_SOUND_PATH + "OnPlayerLost.wav"); audioManager.playerLost = audioManager.loadClip(Constants.BASE_SOUND_PATH + "OnPlayerLost.wav");
@ -127,6 +128,10 @@ public class AudioManager {
checkAndPlayClip(getManager().playerJoinedTable); checkAndPlayClip(getManager().playerJoinedTable);
} }
public static void playPlayerWhispered() {
checkAndPlayClip(getManager().playerWhispered);
}
public static void playPlayerSubmittedDeck() { public static void playPlayerSubmittedDeck() {
checkAndPlayClip(getManager().playerSubmittedDeck); checkAndPlayClip(getManager().playerSubmittedDeck);
} }
@ -207,6 +212,7 @@ public class AudioManager {
private Clip playerJoinedTable = null; private Clip playerJoinedTable = null;
private Clip playerSubmittedDeck = null; private Clip playerSubmittedDeck = null;
private Clip playerWhispered = null;
private Clip playerLeft = null; private Clip playerLeft = null;
private Clip playerWon = null; private Clip playerWon = null;
private Clip playerLost = null; private Clip playerLost = null;

2
Mage.Common/src/mage/interfaces/MageServer.java
View file

@ -62,7 +62,7 @@ public interface MageServer {
// server state methods // server state methods
ServerState getServerState() throws MageException; ServerState getServerState() throws MageException;
List<String> getConnectedPlayers(UUID roomId) throws MageException; List<UsersView> getConnectedPlayers(UUID roomId) throws MageException;
List<MatchView> getFinishedMatches(UUID roomId) throws MageException; List<MatchView> getFinishedMatches(UUID roomId) throws MageException;
Object getServerMessagesCompressed(String sessionId) throws MageException; // messages of the day Object getServerMessagesCompressed(String sessionId) throws MageException; // messages of the day

3
Mage.Common/src/mage/remote/interfaces/ServerState.java
View file

@ -35,6 +35,7 @@ import mage.view.UserView;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
import mage.view.UsersView;
/** /**
* @author noxx * @author noxx
@ -45,7 +46,7 @@ public interface ServerState {
List<UserView> getUsers(); List<UserView> getUsers();
Collection<String> getConnectedPlayers(UUID roomId) throws MageRemoteException; Collection<UsersView> getConnectedPlayers(UUID roomId) throws MageRemoteException;
List<String> getServerMessages(); List<String> getServerMessages();

20
Mage.Common/src/mage/view/ChatMessage.java
View file

@ -42,13 +42,18 @@ public class ChatMessage implements Serializable {
private String message; private String message;
private MessageColor color; private MessageColor color;
private SoundToPlay soundToPlay; private SoundToPlay soundToPlay;
private MessageType messageType;
public enum MessageColor { public enum MessageColor {
BLACK, RED, GREEN, BLUE, ORANGE; BLACK, RED, GREEN, BLUE, ORANGE, YELLOW;
}
public enum MessageType {
USER_INFO, STATUS, GAME, TALK, WHISPER;
} }
public enum SoundToPlay { public enum SoundToPlay {
PlayerLeft, PlayerSubmittedDeck; PlayerLeft, PlayerSubmittedDeck, PlayerWhispered;
} }
public ChatMessage(String username, String message, String time, MessageColor color) { public ChatMessage(String username, String message, String time, MessageColor color) {
@ -56,10 +61,15 @@ public class ChatMessage implements Serializable {
} }
public ChatMessage(String username, String message, String time, MessageColor color, SoundToPlay soundToPlay) { public ChatMessage(String username, String message, String time, MessageColor color, SoundToPlay soundToPlay) {
this(username, message, time, color, MessageType.TALK, soundToPlay);
}
public ChatMessage(String username, String message, String time, MessageColor color, MessageType messageType, SoundToPlay soundToPlay) {
this.username = username; this.username = username;
this.message = message; this.message = message;
this.time = time; this.time = time;
this.color = color; this.color = color;
this.messageType = messageType;
this.soundToPlay = soundToPlay; this.soundToPlay = soundToPlay;
} }
@ -72,7 +82,7 @@ public class ChatMessage implements Serializable {
} }
public boolean isUserMessage() { public boolean isUserMessage() {
return color != null && color.equals(MessageColor.BLUE); return color != null && (color.equals(MessageColor.BLUE) || color.equals(MessageColor.YELLOW));
} }
public boolean isStatusMessage() { public boolean isStatusMessage() {
@ -91,4 +101,8 @@ public class ChatMessage implements Serializable {
return soundToPlay; return soundToPlay;
} }
public MessageType getMessageType() {
return messageType;
}
} }

62
Mage.Common/src/mage/view/UsersView.java Normal file
View file

@ -0,0 +1,62 @@
/*
* 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.view;
import java.io.Serializable;
/**
*
* @author LevelX2
*/
public class UsersView implements Serializable {
private static final long serialVersionUID = 1L;
private String userName;
private String infoState;
private String infoGames;
public UsersView(String userName, String infoState, String infoGames) {
this.userName = userName;
this.infoState = infoState;
this.infoGames = infoGames;
}
public String getUserName() {
return userName;
}
public String getInfoState() {
return infoState;
}
public String getInfoGames() {
return infoGames;
}
}

65
Mage.Server/src/main/java/mage/server/ChatManager.java
View file

@ -28,10 +28,11 @@
package mage.server; package mage.server;
import mage.view.ChatMessage.MessageColor; import java.util.Locale;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import mage.view.ChatMessage.MessageColor;
import mage.view.ChatMessage.MessageType;
import mage.view.ChatMessage.SoundToPlay; import mage.view.ChatMessage.SoundToPlay;
/** /**
@ -69,17 +70,69 @@ public class ChatManager {
} }
public void broadcast(UUID chatId, String userName, String message, MessageColor color) { public void broadcast(UUID chatId, String userName, String message, MessageColor color) {
chatSessions.get(chatId).broadcast(userName, message, color); this.broadcast(chatId, userName, message, color, true);
} }
public void broadcast(UUID chatId, String userName, String message, MessageColor color, boolean withTime) { public void broadcast(UUID chatId, String userName, String message, MessageColor color, boolean withTime) {
chatSessions.get(chatId).broadcast(userName, message, color, withTime); this.broadcast(chatId, userName, message, color, withTime, MessageType.TALK);
} }
public void broadcast(UUID chatId, String userName, String message, MessageColor color, boolean withTime, SoundToPlay soundToPlay) { public void broadcast(UUID chatId, String userName, String message, MessageColor color, boolean withTime, MessageType messageType) {
chatSessions.get(chatId).broadcast(userName, message, color, withTime, soundToPlay); this.broadcast(chatId, userName, message, color, withTime, messageType, null);
} }
public void broadcast(UUID chatId, String userName, String message, MessageColor color, boolean withTime, MessageType messageType, SoundToPlay soundToPlay) {
if (message.startsWith("\\")) {
User user = UserManager.getInstance().findUser(userName);
if (user != null && performUserCommand(user, message, chatId)) {
return;
}
}
chatSessions.get(chatId).broadcast(userName, message, color, withTime, messageType, soundToPlay);
}
private boolean performUserCommand(User user, String message, UUID chatId) {
String command = message.trim().toUpperCase(Locale.ENGLISH);
if (command.equals("\\I") || command.equals("\\INFO")) {
user.setInfo("");
chatSessions.get(chatId).broadcastInfoToUser(user,message);
return true;
}
if (command.startsWith("\\I ") || command.startsWith("\\INFO ")) {
user.setInfo(message.substring(command.startsWith("\\I ") ? 3 : 6));
chatSessions.get(chatId).broadcastInfoToUser(user,message);
return true;
}
if (command.startsWith("\\W ") || command.startsWith("\\WHISPER ")) {
String rest = message.substring(command.startsWith("\\W ") ? 3 : 9);
int first = rest.indexOf(" ");
if (first > 1) {
String userToName = rest.substring(0,first);
rest = rest.substring(first + 1).trim();
User userTo = UserManager.getInstance().findUser(userToName);
if (userTo != null) {
chatSessions.get(chatId).broadcastWhisperToUser(user, userTo, rest);
} else {
message += new StringBuilder("\nUser ").append(userToName).append(" not found").toString();
chatSessions.get(chatId).broadcastInfoToUser(user,message);
}
return true;
}
}
if (command.equals("\\L") || command.equals("\\LIST")) {
message += new StringBuilder("\nList of commands:")
.append("\n\\info <text> - set a info text to your player")
.append("\n\\list - Show a list of commands")
.append("\n\\whisper <player name> <text> - Whiper to a player").toString();
chatSessions.get(chatId).broadcastInfoToUser(user,message);
return true;
}
return false;
}
/** /**
* *
* use mainly for announcing that a user connection was lost or that a user has reconnected * use mainly for announcing that a user connection was lost or that a user has reconnected

41
Mage.Server/src/main/java/mage/server/ChatSession.java
View file

@ -37,6 +37,7 @@ import java.util.concurrent.ConcurrentHashMap;
import mage.interfaces.callback.ClientCallback; import mage.interfaces.callback.ClientCallback;
import mage.view.ChatMessage; import mage.view.ChatMessage;
import mage.view.ChatMessage.MessageColor; import mage.view.ChatMessage.MessageColor;
import mage.view.ChatMessage.MessageType;
import mage.view.ChatMessage.SoundToPlay; import mage.view.ChatMessage.SoundToPlay;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
@ -47,6 +48,8 @@ import org.apache.log4j.Logger;
public class ChatSession { public class ChatSession {
private static final Logger logger = Logger.getLogger(ChatSession.class); private static final Logger logger = Logger.getLogger(ChatSession.class);
private static final Calendar cal = new GregorianCalendar();
private ConcurrentHashMap<UUID, String> clients = new ConcurrentHashMap<UUID, String>(); private ConcurrentHashMap<UUID, String> clients = new ConcurrentHashMap<UUID, String>();
private UUID chatId; private UUID chatId;
private DateFormat timeFormatter = SimpleDateFormat.getTimeInstance(SimpleDateFormat.SHORT); private DateFormat timeFormatter = SimpleDateFormat.getTimeInstance(SimpleDateFormat.SHORT);
@ -60,7 +63,7 @@ public class ChatSession {
if (user != null && !clients.containsKey(userId)) { if (user != null && !clients.containsKey(userId)) {
String userName = user.getName(); String userName = user.getName();
clients.put(userId, userName); clients.put(userId, userName);
broadcast(userName, " has joined", MessageColor.BLUE); broadcast(null, new StringBuilder(userName).append(" has joined").toString(), MessageColor.BLUE, true, MessageType.STATUS);
logger.debug(userName + " joined chat " + chatId); logger.debug(userName + " joined chat " + chatId);
} }
} }
@ -80,22 +83,46 @@ public class ChatSession {
default: default:
message = " has left chat"; message = " has left chat";
} }
broadcast(userName, message, MessageColor.BLUE); broadcast(null, new StringBuilder(userName).append(message).toString(), MessageColor.BLUE, true, MessageType.STATUS);
logger.debug(userName + message + " " + chatId); logger.debug(userName + message + " " + chatId);
} }
} }
public boolean broadcastInfoToUser(User toUser, String message) {
if (clients.containsKey(toUser.getId())) {
toUser.fireCallback(new ClientCallback("chatMessage", chatId, new ChatMessage(null, message, timeFormatter.format(cal.getTime()), MessageColor.ORANGE, MessageType.USER_INFO, null)));
return true;
}
return false;
}
public boolean broadcastWhisperToUser(User fromUser, User toUser, String message) {
if (clients.containsKey(toUser.getId())) {
toUser.fireCallback(new ClientCallback("chatMessage", chatId,
new ChatMessage(new StringBuilder("Whisper from ").append(fromUser.getName()).toString(), message, timeFormatter.format(cal.getTime()), MessageColor.YELLOW, MessageType.WHISPER, SoundToPlay.PlayerWhispered)));
if (clients.containsKey(fromUser.getId())) {
fromUser.fireCallback(new ClientCallback("chatMessage", chatId,
new ChatMessage(new StringBuilder("Whisper to ").append(toUser.getName()).toString(), message, timeFormatter.format(cal.getTime()), MessageColor.YELLOW, MessageType.WHISPER, null)));
return true;
}
}
return false;
}
public void broadcast(String userName, String message, MessageColor color) { public void broadcast(String userName, String message, MessageColor color) {
broadcast(userName, message, color, true); this.broadcast(userName, message, color, true);
} }
public void broadcast(String userName, String message, MessageColor color, boolean withTime) { public void broadcast(String userName, String message, MessageColor color, boolean withTime) {
broadcast(userName, message, color, withTime, null); this.broadcast(userName, message, color, withTime, MessageType.TALK);
} }
public void broadcast(String userName, String message, MessageColor color, boolean withTime, SoundToPlay soundToPlay) { public void broadcast(String userName, String message, MessageColor color, boolean withTime, MessageType messageType) {
this.broadcast(userName, message, color, withTime, messageType, null);
}
public void broadcast(String userName, String message, MessageColor color, boolean withTime, MessageType messageType, SoundToPlay soundToPlay) {
if (!message.isEmpty()) { if (!message.isEmpty()) {
Calendar cal = new GregorianCalendar();
final String msg = message; final String msg = message;
final String time = (withTime ? timeFormatter.format(cal.getTime()):""); final String time = (withTime ? timeFormatter.format(cal.getTime()):"");
final String username = userName; final String username = userName;
@ -103,7 +130,7 @@ public class ChatSession {
for (UUID userId: clients.keySet()) { for (UUID userId: clients.keySet()) {
User user = UserManager.getInstance().getUser(userId); User user = UserManager.getInstance().getUser(userId);
if (user != null) { if (user != null) {
user.fireCallback(new ClientCallback("chatMessage", chatId, new ChatMessage(username, msg, time, color, soundToPlay))); user.fireCallback(new ClientCallback("chatMessage", chatId, new ChatMessage(username, msg, time, color, messageType, soundToPlay)));
} }
else { else {
kill(userId, User.DisconnectReason.CleaningUp); kill(userId, User.DisconnectReason.CleaningUp);

3
Mage.Server/src/main/java/mage/server/MageServerImpl.java
View file

@ -78,6 +78,7 @@ import mage.view.TableView;
import mage.view.TournamentView; import mage.view.TournamentView;
import mage.view.UserDataView; import mage.view.UserDataView;
import mage.view.UserView; import mage.view.UserView;
import mage.view.UsersView;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
/** /**
@ -291,7 +292,7 @@ public class MageServerImpl implements MageServer {
@Override @Override
//FIXME: why no sessionId here??? //FIXME: why no sessionId here???
public List<String> getConnectedPlayers(UUID roomId) throws MageException { public List<UsersView> getConnectedPlayers(UUID roomId) throws MageException {
try { try {
GamesRoom room = GamesRoomManager.getInstance().getRoom(roomId); GamesRoom room = GamesRoomManager.getInstance().getRoom(roomId);
if (room != null) { if (room != null) {

15
Mage.Server/src/main/java/mage/server/User.java
View file

@ -66,6 +66,7 @@ public class User {
private String userName; private String userName;
private String sessionId = ""; private String sessionId = "";
private String host; private String host;
private String info;
private Date connectionTime = new Date(); private Date connectionTime = new Date();
private Date lastActivity = new Date(); private Date lastActivity = new Date();
private UserState userState; private UserState userState;
@ -305,7 +306,7 @@ public class User {
return this.userData; return this.userData;
} }
public String getUserInfo() { public String getGameInfo() {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
if (gameSessions.size() > 0) { if (gameSessions.size() > 0) {
sb.append("G: ").append(gameSessions.size()); sb.append("G: ").append(gameSessions.size());
@ -316,10 +317,14 @@ public class User {
} }
sb.append("T: ").append(tournamentSessions.size()); sb.append("T: ").append(tournamentSessions.size());
} }
if (sb.length() > 0) {
sb.insert(0, " - [");
sb.append("]");
}
return sb.toString(); return sb.toString();
} }
public String getInfo() {
return info;
}
public void setInfo(String Info) {
this.info = Info;
}
} }

15
Mage.Server/src/main/java/mage/server/game/GameController.java
View file

@ -76,7 +76,9 @@ import mage.server.util.ThreadExecutor;
import mage.utils.timer.PriorityTimer; import mage.utils.timer.PriorityTimer;
import mage.view.AbilityPickerView; import mage.view.AbilityPickerView;
import mage.view.CardsView; import mage.view.CardsView;
import mage.view.ChatMessage;
import mage.view.ChatMessage.MessageColor; import mage.view.ChatMessage.MessageColor;
import mage.view.ChatMessage.MessageType;
import mage.view.GameView; import mage.view.GameView;
import mage.view.PermanentView; import mage.view.PermanentView;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
@ -133,11 +135,11 @@ public class GameController implements GameCallback {
updateGame(); updateGame();
break; break;
case INFO: case INFO:
ChatManager.getInstance().broadcast(chatId, "", event.getMessage(), MessageColor.BLACK); ChatManager.getInstance().broadcast(chatId, "", event.getMessage(), MessageColor.BLACK, true, ChatMessage.MessageType.GAME);
logger.debug(game.getId() + " " + event.getMessage()); logger.debug(game.getId() + " " + event.getMessage());
break; break;
case STATUS: case STATUS:
ChatManager.getInstance().broadcast(chatId, "", event.getMessage(), MessageColor.ORANGE, event.getWithTime()); ChatManager.getInstance().broadcast(chatId, "", event.getMessage(), MessageColor.ORANGE, event.getWithTime(), ChatMessage.MessageType.GAME);
logger.debug(game.getId() + " " + event.getMessage()); logger.debug(game.getId() + " " + event.getMessage());
break; break;
case ERROR: case ERROR:
@ -272,7 +274,7 @@ public class GameController implements GameCallback {
gameSession.setUserData(user.getUserData()); gameSession.setUserData(user.getUserData());
user.addGame(playerId, gameSession); user.addGame(playerId, gameSession);
logger.debug(new StringBuilder("Player ").append(playerId).append(" has joined game ").append(game.getId()).toString()); logger.debug(new StringBuilder("Player ").append(playerId).append(" has joined game ").append(game.getId()).toString());
ChatManager.getInstance().broadcast(chatId, "", new StringBuilder(game.getPlayer(playerId).getName()).append(" has joined the game").toString(), MessageColor.BLACK); ChatManager.getInstance().broadcast(chatId, "", new StringBuilder(game.getPlayer(playerId).getName()).append(" has joined the game").toString(), MessageColor.ORANGE, true, MessageType.GAME);
checkStart(); checkStart();
} }
@ -321,7 +323,7 @@ public class GameController implements GameCallback {
GameWatcher gameWatcher = new GameWatcher(userId, game, false); GameWatcher gameWatcher = new GameWatcher(userId, game, false);
watchers.put(userId, gameWatcher); watchers.put(userId, gameWatcher);
gameWatcher.init(); gameWatcher.init();
ChatManager.getInstance().broadcast(chatId, user.getName(), " has started watching", MessageColor.BLUE); ChatManager.getInstance().broadcast(chatId, user.getName(), " has started watching", MessageColor.BLUE, true, ChatMessage.MessageType.STATUS);
} }
} }
@ -329,7 +331,7 @@ public class GameController implements GameCallback {
watchers.remove(userId); watchers.remove(userId);
User user = UserManager.getInstance().getUser(userId); User user = UserManager.getInstance().getUser(userId);
if (user != null) { if (user != null) {
ChatManager.getInstance().broadcast(chatId, user.getName(), " has stopped watching", MessageColor.BLUE); ChatManager.getInstance().broadcast(chatId, user.getName(), " has stopped watching", MessageColor.BLUE, true, ChatMessage.MessageType.STATUS);
} }
} }
@ -405,12 +407,11 @@ public class GameController implements GameCallback {
public void timeout(UUID userId) { public void timeout(UUID userId) {
if (userPlayerMap.containsKey(userId)) { if (userPlayerMap.containsKey(userId)) {
;
StringBuilder sb = new StringBuilder(game.getPlayer(userPlayerMap.get(userId)).getName()) StringBuilder sb = new StringBuilder(game.getPlayer(userPlayerMap.get(userId)).getName())
.append(" has timed out (player had priority and was not active for ") .append(" has timed out (player had priority and was not active for ")
.append(ConfigSettings.getInstance().getMaxSecondsIdle()) .append(ConfigSettings.getInstance().getMaxSecondsIdle())
.append(" seconds ) - Auto concede."); .append(" seconds ) - Auto concede.");
ChatManager.getInstance().broadcast(chatId, "", sb.toString() , MessageColor.BLACK); ChatManager.getInstance().broadcast(chatId, "", sb.toString() , MessageColor.BLACK, true, MessageType.STATUS);
concede(userId); concede(userId);
} }
} }

3
Mage.Server/src/main/java/mage/server/game/GamesRoom.java
View file

@ -38,6 +38,7 @@ import mage.game.tournament.TournamentOptions;
import mage.server.Room; import mage.server.Room;
import mage.view.MatchView; import mage.view.MatchView;
import mage.view.TableView; import mage.view.TableView;
import mage.view.UsersView;
/** /**
* *
@ -47,7 +48,7 @@ public interface GamesRoom extends Room {
List<TableView> getTables(); List<TableView> getTables();
List<MatchView> getFinished(); List<MatchView> getFinished();
List<String> getPlayers(); List<UsersView> getPlayers();
boolean joinTable(UUID userId, UUID tableId, String name, String playerType, int skill, DeckCardLists deckList) throws MageException; boolean joinTable(UUID userId, UUID tableId, String name, String playerType, int skill, DeckCardLists deckList) throws MageException;
boolean joinTournamentTable(UUID userId, UUID tableId, String name, String playerType, int skill) throws GameException; boolean joinTournamentTable(UUID userId, UUID tableId, String name, String playerType, int skill) throws GameException;
TableView createTable(UUID userId, MatchOptions options); TableView createTable(UUID userId, MatchOptions options);

27
Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java
View file

@ -38,9 +38,9 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import mage.constants.TableState;
import mage.MageException; import mage.MageException;
import mage.cards.decks.DeckCardLists; import mage.cards.decks.DeckCardLists;
import mage.constants.TableState;
import mage.game.GameException; import mage.game.GameException;
import mage.game.Table; import mage.game.Table;
import mage.game.match.MatchOptions; import mage.game.match.MatchOptions;
@ -51,9 +51,9 @@ import mage.server.User;
import mage.server.UserManager; import mage.server.UserManager;
import mage.view.MatchView; import mage.view.MatchView;
import mage.view.TableView; import mage.view.TableView;
import mage.view.UsersView;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
/** /**
* *
* @author BetaSteward_at_googlemail.com * @author BetaSteward_at_googlemail.com
@ -65,7 +65,7 @@ public class GamesRoomImpl extends RoomImpl implements GamesRoom, Serializable {
private static ScheduledExecutorService updateExecutor = Executors.newSingleThreadScheduledExecutor(); private static ScheduledExecutorService updateExecutor = Executors.newSingleThreadScheduledExecutor();
private static List<TableView> tableView = new ArrayList<TableView>(); private static List<TableView> tableView = new ArrayList<TableView>();
private static List<MatchView> matchView = new ArrayList<MatchView>(); private static List<MatchView> matchView = new ArrayList<MatchView>();
private static List<String> playersView = new ArrayList<String>(); private static List<UsersView> usersView = new ArrayList<UsersView>();
private ConcurrentHashMap<UUID, Table> tables = new ConcurrentHashMap<UUID, Table>(); private ConcurrentHashMap<UUID, Table> tables = new ConcurrentHashMap<UUID, Table>();
@ -109,16 +109,16 @@ public class GamesRoomImpl extends RoomImpl implements GamesRoom, Serializable {
} }
tableView = tableList; tableView = tableList;
matchView = matchList; matchView = matchList;
List<String> players = new ArrayList<String>(); List<UsersView> users = new ArrayList<UsersView>();
for (User user : UserManager.getInstance().getUsers()) { for (User user : UserManager.getInstance().getUsers()) {
StringBuilder sb = new StringBuilder(user.getName()); StringBuilder sb = new StringBuilder(user.getGameInfo());
sb.append(user.getUserInfo());
if (!user.isConnected()) { if (!user.isConnected()) {
sb.append(" (discon.)"); sb.append(" (discon.)");
} }
players.add(sb.toString()); users.add(new UsersView(user.getName(), user.getInfo(), sb.toString()));
} }
playersView = players; Collections.sort(users, new UserNameSorter());
usersView = users;
} }
@Override @Override
@ -190,8 +190,8 @@ public class GamesRoomImpl extends RoomImpl implements GamesRoom, Serializable {
} }
@Override @Override
public List<String> getPlayers() { public List<UsersView> getPlayers() {
return playersView; return usersView;
} }
} }
@ -202,3 +202,10 @@ class TimestampSorter implements Comparator<Table> {
return one.getCreateTime().compareTo(two.getCreateTime()); return one.getCreateTime().compareTo(two.getCreateTime());
} }
} }
class UserNameSorter implements Comparator<UsersView> {
@Override
public int compare(UsersView one, UsersView two) {
return one.getUserName().compareTo(two.getUserName());
}
}

11
Mage.Server/src/main/java/mage/server/tournament/TournamentController.java
View file

@ -54,6 +54,7 @@ import mage.server.draft.DraftManager;
import mage.server.game.GamesRoomManager; import mage.server.game.GamesRoomManager;
import mage.server.util.ThreadExecutor; import mage.server.util.ThreadExecutor;
import mage.view.ChatMessage.MessageColor; import mage.view.ChatMessage.MessageColor;
import mage.view.ChatMessage.MessageType;
import mage.view.ChatMessage.SoundToPlay; import mage.view.ChatMessage.SoundToPlay;
import mage.view.TournamentView; import mage.view.TournamentView;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
@ -91,7 +92,7 @@ public class TournamentController {
public void event(TableEvent event) { public void event(TableEvent event) {
switch (event.getEventType()) { switch (event.getEventType()) {
case INFO: case INFO:
ChatManager.getInstance().broadcast(chatId, "", event.getMessage(), MessageColor.BLACK); ChatManager.getInstance().broadcast(chatId, "", event.getMessage(), MessageColor.BLACK, true, MessageType.STATUS);
logger.debug(tournament.getId() + " " + event.getMessage()); logger.debug(tournament.getId() + " " + event.getMessage());
break; break;
case START_DRAFT: case START_DRAFT:
@ -137,7 +138,7 @@ public class TournamentController {
if (!player.getPlayer().isHuman()) { if (!player.getPlayer().isHuman()) {
player.setJoined(); player.setJoined();
logger.debug("player " + player.getPlayer().getId() + " has joined tournament " + tournament.getId()); logger.debug("player " + player.getPlayer().getId() + " has joined tournament " + tournament.getId());
ChatManager.getInstance().broadcast(chatId, "", player.getPlayer().getName() + " has joined the tournament", MessageColor.BLACK); ChatManager.getInstance().broadcast(chatId, "", player.getPlayer().getName() + " has joined the tournament", MessageColor.BLACK, true, MessageType.STATUS);
} }
} }
checkStart(); checkStart();
@ -151,7 +152,7 @@ public class TournamentController {
TournamentPlayer player = tournament.getPlayer(playerId); TournamentPlayer player = tournament.getPlayer(playerId);
player.setJoined(); player.setJoined();
logger.debug("player " + playerId + " has joined tournament " + tournament.getId()); logger.debug("player " + playerId + " has joined tournament " + tournament.getId());
ChatManager.getInstance().broadcast(chatId, "", player.getPlayer().getName() + " has joined the tournament", MessageColor.BLACK); ChatManager.getInstance().broadcast(chatId, "", player.getPlayer().getName() + " has joined the tournament", MessageColor.BLACK, true, MessageType.STATUS);
checkStart(); checkStart();
} }
@ -247,7 +248,7 @@ public class TournamentController {
TournamentPlayer player = tournament.getPlayer(playerId); TournamentPlayer player = tournament.getPlayer(playerId);
if (player != null && !player.hasQuit()) { if (player != null && !player.hasQuit()) {
tournamentSessions.get(playerId).submitDeck(deck); tournamentSessions.get(playerId).submitDeck(deck);
ChatManager.getInstance().broadcast(chatId, "", player.getPlayer().getName() + " has submitted his tournament deck", MessageColor.BLACK, true, SoundToPlay.PlayerSubmittedDeck); ChatManager.getInstance().broadcast(chatId, "", player.getPlayer().getName() + " has submitted his tournament deck", MessageColor.BLACK, true, MessageType.STATUS, SoundToPlay.PlayerSubmittedDeck);
} }
} }
} }
@ -275,7 +276,7 @@ public class TournamentController {
TournamentPlayer tPlayer = tournament.getPlayer(playerId); TournamentPlayer tPlayer = tournament.getPlayer(playerId);
if (tPlayer != null) { if (tPlayer != null) {
if (started) { if (started) {
ChatManager.getInstance().broadcast(chatId, "", tPlayer.getPlayer().getName() + " has quit the tournament", MessageColor.BLACK, true, SoundToPlay.PlayerLeft); ChatManager.getInstance().broadcast(chatId, "", tPlayer.getPlayer().getName() + " has quit the tournament", MessageColor.BLACK, true, MessageType.STATUS, SoundToPlay.PlayerLeft);
String info; String info;
if (tournament.isDoneConstructing()) { if (tournament.isDoneConstructing()) {
info = new StringBuilder("during round ").append(tournament.getRounds().size()).toString(); info = new StringBuilder("during round ").append(tournament.getRounds().size()).toString();

2
Mage/src/mage/game/GameImpl.java
View file

@ -558,7 +558,7 @@ public abstract class GameImpl<T extends GameImpl<T>> implements Game, Serializa
boolean wasPaused = state.isPaused(); boolean wasPaused = state.isPaused();
state.resume(); state.resume();
if (!isGameOver()) { if (!isGameOver()) {
fireInformEvent("Turn " + Integer.toString(state.getTurnNum())); fireInformEvent(new StringBuilder("Turn ").append(state.getTurnNum()).toString());
if (checkStopOnTurnOption()) { if (checkStopOnTurnOption()) {
return; return;
} }