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

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

Revision: 2569
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=2569&view=rev
Author:   rodneykinney
Date:     2007-10-18 05:13:51 -0700 (Thu, 18 Oct 2007)

Log Message:
-----------
JabberClient continued

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

Added Paths:
-----------
    VASSAL-src/trunk/VASSAL/chat/jabber/Interceptor.java

Added: VASSAL-src/trunk/VASSAL/chat/jabber/Interceptor.java
===================================================================
--- VASSAL-src/trunk/VASSAL/chat/jabber/Interceptor.java	                        (rev 0)
+++ VASSAL-src/trunk/VASSAL/chat/jabber/Interceptor.java	2007-10-18 12:13:51 UTC (rev 2569)
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2000-2007 by Rodney Kinney
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License (LGPL) as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, copies are available
+ * at http://www.opensource.org.
+ */
+
+package VASSAL.chat.jabber;
+
+import org.jivesoftware.smack.PacketInterceptor;
+import org.jivesoftware.smack.XMPPConnection;
+import org.jivesoftware.smack.filter.PacketFilter;
+import org.jivesoftware.smack.packet.Packet;
+
+/**
+ * Convenience class that combines a packet filter and interceptor, with logging of untrapped runtime exceptions
+ * @author rodneykinney
+ *
+ */
+public abstract class Interceptor implements PacketInterceptor, PacketFilter {
+  public void interceptPacket(Packet packet) {
+    try {
+      intercept(packet);
+    }
+    catch (RuntimeException e) {
+      e.printStackTrace();
+    }
+  }
+  
+  protected abstract void intercept(Packet p);
+
+  public boolean accept(Packet packet) {
+    try {
+      return acceptPacket(packet);
+    }
+    catch (RuntimeException e) {
+      e.printStackTrace();
+      return false;
+    }
+  }
+  
+  protected abstract boolean acceptPacket(Packet packet);
+  
+  public void addTo(XMPPConnection conn) {
+    conn.addPacketWriterInterceptor(this, this);
+  }
+}

Modified: VASSAL-src/trunk/VASSAL/chat/jabber/JabberClient.java
===================================================================
--- VASSAL-src/trunk/VASSAL/chat/jabber/JabberClient.java	2007-10-17 13:35:29 UTC (rev 2568)
+++ VASSAL-src/trunk/VASSAL/chat/jabber/JabberClient.java	2007-10-18 12:13:51 UTC (rev 2569)
@@ -181,10 +181,9 @@
             }
           }
           monitor = new MonitorRooms();
+          monitor.init();
           propSupport.firePropertyChange(CONNECTED, null, Boolean.TRUE);
           setRoom(defaultRoom);
-          // poll = new Timer();
-          // poll.scheduleAtFixedRate(new PollRoomsThread(),1000,30000);
         }
         catch (XMPPException e) {
           reportXMPPException(e);
@@ -370,7 +369,7 @@
       }
     };
 
-    public MonitorRooms() throws XMPPException {
+    public void init() throws XMPPException {
       new TrackRooms().addTo(conn);
       new TrackStatus(getMonitorRoomJID().toLowerCase()).addTo(conn);
       monitorRoom = new MultiUserChat(conn, getMonitorRoomJID());
@@ -479,10 +478,7 @@
     }
 
     public void joined(String participant) {
-      // sendStatus((SimpleStatus) me.getStatus());
-      System.out.println(participant + " joined the monitor room");
-      JabberPlayer player = playerMgr.getPlayer(getAbsolutePlayerJID(participant));
-      // sendRoomQuery(player.getJid());
+      playerMgr.getPlayer(getAbsolutePlayerJID(participant));
     }
 
     public void left(String participant) {

Modified: VASSAL-src/trunk/VASSAL/chat/jabber/JabberRoom.java
===================================================================
--- VASSAL-src/trunk/VASSAL/chat/jabber/JabberRoom.java	2007-10-17 13:35:29 UTC (rev 2568)
+++ VASSAL-src/trunk/VASSAL/chat/jabber/JabberRoom.java	2007-10-18 12:13:51 UTC (rev 2569)
@@ -62,12 +62,12 @@
         throw e;
       }
     }
-//    try {
-//      chat.changeSubject(getName());
-//    }
-//    catch (XMPPException e) {
-//      // Room already exists but we're not the owner
-//    }
+    try {
+      chat.changeSubject(getName());
+    }
+    catch (XMPPException e) {
+      // Room already exists but we're not the owner
+    }
     chat.addMessageListener(client);
     return chat;
   }


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