[Xmpp4js-commit] SF.net SVN: xmpp4js:[766] trunk/src

[<h-i...@us...>]

Revision: 766
          http://xmpp4js.svn.sourceforge.net/xmpp4js/?rev=766&view=rev
Author:   h-iverson
Date:     2008-08-04 22:29:58 +0000 (Mon, 04 Aug 2008)

Log Message:
-----------
changed PacketTypeFilter to PacketClassFilter

Modified Paths:
--------------
    trunk/src/main/javascript/PacketFilter.js
    trunk/src/main/javascript/chat/ChatManager.js
    trunk/src/main/javascript/chat/MessageThreadFilter.js
    trunk/src/main/javascript/muc/MucPresenceFilter.js
    trunk/src/main/javascript/roster/Roster.js
    trunk/src/site/xdoc/code-samples.xml
    trunk/src/test/javascript/PacketFilterTest.html

Modified: trunk/src/main/javascript/PacketFilter.js
===================================================================
--- trunk/src/main/javascript/PacketFilter.js	2008-08-04 18:47:58 UTC (rev 765)
+++ trunk/src/main/javascript/PacketFilter.js	2008-08-04 22:29:58 UTC (rev 766)
@@ -139,20 +139,20 @@
  * @constructor
  * @extends Xmpp4Js.PacketFilter.PacketFilter
  */
-Xmpp4Js.PacketFilter.PacketTypeFilter = function(type) {
-	Xmpp4Js.PacketFilter.PacketTypeFilter.superclass.constructor.apply(this, arguments);
+Xmpp4Js.PacketFilter.PacketClassFilter = function(type) {
+	Xmpp4Js.PacketFilter.PacketClassFilter.superclass.constructor.apply(this, arguments);
 	
 	this.type = type;
 }
 	
-Xmpp4Js.PacketFilter.PacketTypeFilter.prototype = {
+Xmpp4Js.PacketFilter.PacketClassFilter.prototype = {
 	accept: function(packet) {
 		return packet instanceof (this.type);
 	}
 };
 
 
-Xmpp4Js.Lang.extend(Xmpp4Js.PacketFilter.PacketTypeFilter, Xmpp4Js.PacketFilter.PacketFilter, Xmpp4Js.PacketFilter.PacketTypeFilter.prototype);
+Xmpp4Js.Lang.extend(Xmpp4Js.PacketFilter.PacketClassFilter, Xmpp4Js.PacketFilter.PacketFilter, Xmpp4Js.PacketFilter.PacketClassFilter.prototype);
 
 /**
  * Filters for packets with a particular packet ID.
@@ -203,7 +203,7 @@
 Xmpp4Js.PacketFilter.IQQueryNSFilter = function(namespace) {
 	Xmpp4Js.PacketFilter.IQQueryNSFilter.superclass.constructor.apply(this, arguments);
 	
-    this.iqFilter = new Xmpp4Js.PacketFilter.PacketTypeFilter( Xmpp4Js.Packet.IQ );
+    this.iqFilter = new Xmpp4Js.PacketFilter.PacketClassFilter( Xmpp4Js.Packet.IQ );
 	this.namespace = namespace;
 }
 	

Modified: trunk/src/main/javascript/chat/ChatManager.js
===================================================================
--- trunk/src/main/javascript/chat/ChatManager.js	2008-08-04 18:47:58 UTC (rev 765)
+++ trunk/src/main/javascript/chat/ChatManager.js	2008-08-04 22:29:58 UTC (rev 766)
@@ -72,7 +72,7 @@
     _registerEvents : function() {
         this.con.addPacketListener( function(stanza) {			
             this._handleMessageReceived( stanza );
-        }.bind(this), new Xmpp4Js.PacketFilter.PacketTypeFilter( Xmpp4Js.Packet.Message ));		
+        }.bind(this), new Xmpp4Js.PacketFilter.PacketClassFilter( Xmpp4Js.Packet.Message ));		
     },
 
     /**

Modified: trunk/src/main/javascript/chat/MessageThreadFilter.js
===================================================================
--- trunk/src/main/javascript/chat/MessageThreadFilter.js	2008-08-04 18:47:58 UTC (rev 765)
+++ trunk/src/main/javascript/chat/MessageThreadFilter.js	2008-08-04 22:29:58 UTC (rev 766)
@@ -10,9 +10,9 @@
     this.thread = thread;
     /** A filter for Message packets 
      * @private 
-     * @type Xmpp4Js.PacketFilter.PacketTypeFilter 
+     * @type Xmpp4Js.PacketFilter.PacketClassFilter 
      */
-    this.packetTypeFilter = new Xmpp4Js.PacketFilter.PacketTypeFilter( Xmpp4Js.Packet.Message );
+    this.packetClassFilter = new Xmpp4Js.PacketFilter.PacketClassFilter( Xmpp4Js.Packet.Message );
 }
 
 Xmpp4Js.Chat.MessageThreadFilter.prototype = {
@@ -20,7 +20,7 @@
      * Return true if this is a Message packet and its thread equals the one we're interested in.
      */
     accept: function(stanza) {
-        return this.packetTypeFilter.accept(stanza)
+        return this.packetClassFilter.accept(stanza)
         && stanza.getThread() == this.thread;
     }
 }

Modified: trunk/src/main/javascript/muc/MucPresenceFilter.js
===================================================================
--- trunk/src/main/javascript/muc/MucPresenceFilter.js	2008-08-04 18:47:58 UTC (rev 765)
+++ trunk/src/main/javascript/muc/MucPresenceFilter.js	2008-08-04 22:29:58 UTC (rev 766)
@@ -9,7 +9,7 @@
 Xmpp4Js.Muc.MucPresenceFilter = function(fromJid) {
     this.fromJid = fromJid;
     
-    this.presenceFilter = new Xmpp4Js.PacketFilter.PacketTypeFilter( Xmpp4Js.Packet.Presence ); 
+    this.presenceFilter = new Xmpp4Js.PacketFilter.PacketClassFilter( Xmpp4Js.Packet.Presence ); 
     if(fromJid != undefined) {
         this.fromFilter = new Xmpp4Js.PacketFilter.FromContainsFilter(fromJid);
     }

Modified: trunk/src/main/javascript/roster/Roster.js
===================================================================
--- trunk/src/main/javascript/roster/Roster.js	2008-08-04 18:47:58 UTC (rev 765)
+++ trunk/src/main/javascript/roster/Roster.js	2008-08-04 22:29:58 UTC (rev 766)
@@ -27,10 +27,10 @@
     this.con = con;
 
     
-    this.con.addPacketListener( this.rosterItemManager.rosterPacketListener.bind(this.rosterItemManager), new Xmpp4Js.PacketFilter.PacketTypeFilter( Xmpp4Js.Packet.RosterPacket ) );
-    this.con.addPacketListener( this.rosterItemManager.rosterSubSyncPacketListener.bind(this.rosterItemManager), new Xmpp4Js.PacketFilter.PacketTypeFilter( Xmpp4Js.Packet.Presence ) );
+    this.con.addPacketListener( this.rosterItemManager.rosterPacketListener.bind(this.rosterItemManager), new Xmpp4Js.PacketFilter.PacketClassFilter( Xmpp4Js.Packet.RosterPacket ) );
+    this.con.addPacketListener( this.rosterItemManager.rosterSubSyncPacketListener.bind(this.rosterItemManager), new Xmpp4Js.PacketFilter.PacketClassFilter( Xmpp4Js.Packet.Presence ) );
     
-    this.con.addPacketListener( this.presenceManager.presencePacketListener.bind(this.presenceManager), new Xmpp4Js.PacketFilter.PacketTypeFilter( Xmpp4Js.Packet.Presence ) );
+    this.con.addPacketListener( this.presenceManager.presencePacketListener.bind(this.presenceManager), new Xmpp4Js.PacketFilter.PacketClassFilter( Xmpp4Js.Packet.Presence ) );
     
 
 }

Modified: trunk/src/site/xdoc/code-samples.xml
===================================================================
--- trunk/src/site/xdoc/code-samples.xml	2008-08-04 18:47:58 UTC (rev 765)
+++ trunk/src/site/xdoc/code-samples.xml	2008-08-04 22:29:58 UTC (rev 766)
@@ -173,7 +173,7 @@
     } else {
       alert( from + " is offline." );
     }
-}, new PacketTypeFilter( Packet.Presence ) );
+}, new PacketClassFilter( Packet.Presence ) );
 ]]></pre>
 </subsection>
 
@@ -197,7 +197,7 @@
       outPres.setTo( presence.getFrom() );
       con.send( outPres );
     }
-}, new PacketTypeFilter( Packet.Presence ) );
+}, new PacketClassFilter( Packet.Presence ) );
 ]]></pre>
 </subsection>
 
@@ -217,7 +217,7 @@
     }, 
     // capture only Message packets with MessageEventExtension
     new AndFilter(
-      new PacketTypeFilter( Packet.Message ), 
+      new PacketClassFilter( Packet.Message ), 
       new ExtensionFilter( MessageEventExtension.XMLNS )
     ) 
 );

Modified: trunk/src/test/javascript/PacketFilterTest.html
===================================================================
--- trunk/src/test/javascript/PacketFilterTest.html	2008-08-04 18:47:58 UTC (rev 765)
+++ trunk/src/test/javascript/PacketFilterTest.html	2008-08-04 22:29:58 UTC (rev 766)
@@ -34,20 +34,20 @@
 	
 }
 
-function testPacketTypeFilter_True() {
+function testPacketClassFilter_True() {
 
 	var stanza = packetHelper.createIQ( "te...@te...", "set", "jabber:iq:roster" );
 
-	var pf = new Xmpp4Js.PacketFilter.PacketTypeFilter( Xmpp4Js.Packet.IQ );
+	var pf = new Xmpp4Js.PacketFilter.PacketClassFilter( Xmpp4Js.Packet.IQ );
 	
 	var result = pf.accept( stanza );
 	assertTrue( result );
 }
 
-function testPacketTypeFilter_False() {
+function testPacketClassFilter_False() {
 	var stanza = packetHelper.createIQ( "te...@te...", "set", "jabber:iq:roster" );
 
-	var pf = new Xmpp4Js.PacketFilter.PacketTypeFilter( Xmpp4Js.Packet.Message );
+	var pf = new Xmpp4Js.PacketFilter.PacketClassFilter( Xmpp4Js.Packet.Message );
 	
 	var result = pf.accept( stanza );
 	assertFalse( result );


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