[vassalengine-svn] SF.net SVN: vassalengine: [2579] VASSAL-src/trunk/VASSAL/chat/jabber/ JabberClient.java

[<rod...@us...>]

Revision: 2579
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=2579&view=rev
Author:   rodneykinney
Date:     2007-10-26 21:15:14 -0700 (Fri, 26 Oct 2007)

Log Message:
-----------
JabberClient integration

Modified Paths:
--------------
    VASSAL-src/trunk/VASSAL/chat/jabber/JabberClient.java

Modified: VASSAL-src/trunk/VASSAL/chat/jabber/JabberClient.java
===================================================================
--- VASSAL-src/trunk/VASSAL/chat/jabber/JabberClient.java	2007-10-23 04:19:24 UTC (rev 2578)
+++ VASSAL-src/trunk/VASSAL/chat/jabber/JabberClient.java	2007-10-27 04:15:14 UTC (rev 2579)
@@ -60,11 +60,13 @@
 import VASSAL.build.GameModule;
 import VASSAL.chat.ChatServerConnection;
 import VASSAL.chat.Player;
+import VASSAL.chat.PlayerEncoder;
 import VASSAL.chat.PrivateChatManager;
 import VASSAL.chat.Room;
 import VASSAL.chat.ServerStatus;
 import VASSAL.chat.SimplePlayer;
 import VASSAL.chat.SimpleStatus;
+import VASSAL.chat.SynchEncoder;
 import VASSAL.chat.messageboard.MessageBoard;
 import VASSAL.chat.ui.ChatControlsInitializer;
 import VASSAL.chat.ui.ChatServerControls;
@@ -80,7 +82,7 @@
 import VASSAL.command.CommandEncoder;
 import VASSAL.i18n.Resources;
 
-public class JabberClient implements ChatServerConnection, PacketListener, ServerStatus, ChatControlsInitializer {
+public class JabberClient implements ChatServerConnection, PacketListener, ServerStatus, ChatControlsInitializer, PlayerEncoder {
   private static final String QUERY_ROOMS = "http://jabber.org/protocol/muc#rooms";
   private MessageBoard msgSvr;
   private XMPPConnection conn;
@@ -94,6 +96,7 @@
   private final JabberRoom defaultRoom;
   private MultiUserChat currentChat;
   private AccountInfo account;
+  private SynchEncoder synchEncoder;
   protected MessageBoardControlsInitializer messageBoardControls;
   protected RoomInteractionControlsInitializer roomControls;
   // protected ServerStatusControlsInitializer serverStatusControls;
@@ -116,6 +119,7 @@
     roomControls.addPlayerActionFactory(SendSoundAction.factory(this, Resources.getString("Chat.send_wakeup"), "wakeUpSound", "phone1.wav")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     // serverStatusControls = new ServerStatusControlsInitializer(serverStatus);
     playerStatusControls = new SimpleStatusControlsInitializer(this);
+    synchEncoder = new SynchEncoder(this,this);
   }
 
   public void addPropertyChangeListener(String propertyName, PropertyChangeListener l) {
@@ -234,7 +238,7 @@
     messageBoardControls.initializeControls(controls);
     roomControls.initializeControls(controls);
     // serverStatusControls.initializeControls(controls);
-    // GameModule.getGameModule().addCommandEncoder(synchEncoder);
+    GameModule.getGameModule().addCommandEncoder(synchEncoder);
     // GameModule.getGameModule().addCommandEncoder(privateChatEncoder);
     // GameModule.getGameModule().addCommandEncoder(soundEncoder);
     controls.getRoomTree().setCellRenderer(new LockableRoomTreeRenderer());
@@ -245,7 +249,7 @@
     roomControls.uninitializeControls(controls);
     playerStatusControls.uninitializeControls(controls);
     // serverStatusControls.uninitializeControls(controls);
-    // GameModule.getGameModule().removeCommandEncoder(synchEncoder);
+    GameModule.getGameModule().removeCommandEncoder(synchEncoder);
     // GameModule.getGameModule().removeCommandEncoder(privateChatEncoder);
     // GameModule.getGameModule().removeCommandEncoder(soundEncoder);
   }
@@ -712,4 +716,12 @@
   public String getHost() {
     return host;
   }
+
+  public String playerToString(Player p) {
+    return ((JabberPlayer)p).getJid();
+  }
+
+  public Player stringToPlayer(String s) {
+    return playerMgr.getPlayer(s);
+  }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.