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

Mage.Common/src/mage/interfaces/MageServer.java

@@ -62,7 +62,7 @@ public interface MageServer {
 
     // server state methods
     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;
     Object getServerMessagesCompressed(String sessionId) throws MageException;     // messages of the day
 

Mage.Common/src/mage/remote/interfaces/ServerState.java

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

Mage.Common/src/mage/view/ChatMessage.java

@@ -42,13 +42,18 @@ public class ChatMessage implements Serializable {
     private String message;
     private MessageColor color;
     private SoundToPlay soundToPlay;
+    private MessageType messageType;
 
     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 {
-        PlayerLeft, PlayerSubmittedDeck;
+        PlayerLeft, PlayerSubmittedDeck, PlayerWhispered;
     }
 
     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) {
+        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.message = message;
         this.time = time;
         this.color = color;
+        this.messageType = messageType;
         this.soundToPlay = soundToPlay;
     }
 
@@ -72,7 +82,7 @@ public class ChatMessage implements Serializable {
     }
 
     public boolean isUserMessage() {
-        return color != null && color.equals(MessageColor.BLUE);
+        return color != null && (color.equals(MessageColor.BLUE) || color.equals(MessageColor.YELLOW));
     }
 
     public boolean isStatusMessage() {
@@ -91,4 +101,8 @@ public class ChatMessage implements Serializable {
         return soundToPlay;
     }
 
+    public MessageType getMessageType() {
+        return messageType;
+    }
+
 }

Mage.Common/src/mage/view/UsersView.java

@@ -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;
+    }
+
+}