From 216971659a411e1731c8c7bb96c143c7fe975c76 Mon Sep 17 00:00:00 2001 From: Gaston Dombiak Date: Fri, 15 Sep 2006 23:05:01 +0000 Subject: [PATCH] Renamed ConnectionEstablishedListener to ConnectionCreationListener. SMACK-173 git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@5388 b35dd754-fafc-0310-a699-88a17e54d16e --- .../smack/PrivacyListManager.java | 4 +-- .../smack/ReconnectionManager.java | 4 +-- .../jivesoftware/smack/XMPPConnection.java | 28 ++++++++++--------- .../smackx/LastActivityManager.java | 4 +-- .../smackx/ServiceDiscoveryManager.java | 4 +-- .../org/jivesoftware/smackx/XHTMLManager.java | 15 ++++++---- .../smackx/muc/MultiUserChat.java | 4 +-- 7 files changed, 34 insertions(+), 29 deletions(-) diff --git a/source/org/jivesoftware/smack/PrivacyListManager.java b/source/org/jivesoftware/smack/PrivacyListManager.java index 129918bd6..7f20d4a85 100644 --- a/source/org/jivesoftware/smack/PrivacyListManager.java +++ b/source/org/jivesoftware/smack/PrivacyListManager.java @@ -35,8 +35,8 @@ public class PrivacyListManager { // Create a new PrivacyListManager on every established connection. In the init() // method of PrivacyListManager, we'll add a listener that will delete the // instance when the connection is closed. - XMPPConnection.addConnectionEstablishedListener(new ConnectionEstablishedListener() { - public void connectionEstablished(XMPPConnection connection) { + XMPPConnection.addConnectionCreationListener(new ConnectionCreationListener() { + public void connectionCreated(XMPPConnection connection) { new PrivacyListManager(connection); } }); diff --git a/source/org/jivesoftware/smack/ReconnectionManager.java b/source/org/jivesoftware/smack/ReconnectionManager.java index a36e771bd..a83cfcf78 100644 --- a/source/org/jivesoftware/smack/ReconnectionManager.java +++ b/source/org/jivesoftware/smack/ReconnectionManager.java @@ -35,8 +35,8 @@ public class ReconnectionManager implements ConnectionListener { // Create a new PrivacyListManager on every established connection. In the init() // method of PrivacyListManager, we'll add a listener that will delete the // instance when the connection is closed. - XMPPConnection.addConnectionEstablishedListener(new ConnectionEstablishedListener() { - public void connectionEstablished(XMPPConnection connection) { + XMPPConnection.addConnectionCreationListener(new ConnectionCreationListener() { + public void connectionCreated(XMPPConnection connection) { connection.addConnectionListener(new ReconnectionManager(connection)); } }); diff --git a/source/org/jivesoftware/smack/XMPPConnection.java b/source/org/jivesoftware/smack/XMPPConnection.java index b071a5c33..f3f191933 100644 --- a/source/org/jivesoftware/smack/XMPPConnection.java +++ b/source/org/jivesoftware/smack/XMPPConnection.java @@ -89,8 +89,8 @@ public class XMPPConnection { */ public static boolean DEBUG_ENABLED = false; - private final static Set connectionEstablishedListeners = - new CopyOnWriteArraySet(); + private final static Set connectionEstablishedListeners = + new CopyOnWriteArraySet(); static { // Use try block since we may not have permission to get a system @@ -812,22 +812,24 @@ public class XMPPConnection { } /** - * Adds a connection established listener that will be notified when a new connection - * is established. + * Adds a new listener that will be notified when new XMPPConnections are created. Note + * that newly created connections will not be actually connected to the server. * - * @param connectionEstablishedListener a listener interested on connection established events. + * @param connectionCreationListener a listener interested on new connections. */ - public static void addConnectionEstablishedListener(ConnectionEstablishedListener connectionEstablishedListener) { - connectionEstablishedListeners.add(connectionEstablishedListener); + public static void addConnectionCreationListener( + ConnectionCreationListener connectionCreationListener) { + connectionEstablishedListeners.add(connectionCreationListener); } /** - * Removes a listener on new established connections. + * Removes a listener that was interested in connection creation events. * - * @param connectionEstablishedListener a listener interested on connection established events. + * @param connectionCreationListener a listener interested on new connections. */ - public static void removeConnectionEstablishedListener(ConnectionEstablishedListener connectionEstablishedListener) { - connectionEstablishedListeners.remove(connectionEstablishedListener); + public static void removeConnectionCreationListener( + ConnectionCreationListener connectionCreationListener) { + connectionEstablishedListeners.remove(connectionCreationListener); } private void connectUsingConfiguration(ConnectionConfiguration config) throws XMPPException { @@ -922,8 +924,8 @@ public class XMPPConnection { if (isFirstInitialization) { // Notify listeners that a new connection has been established - for (ConnectionEstablishedListener listener : connectionEstablishedListeners) { - listener.connectionEstablished(this); + for (ConnectionCreationListener listener : connectionEstablishedListeners) { + listener.connectionCreated(this); } // Add a listener for all message packets so that we can deliver errant diff --git a/source/org/jivesoftware/smackx/LastActivityManager.java b/source/org/jivesoftware/smackx/LastActivityManager.java index 023368cc2..2b64a53a2 100644 --- a/source/org/jivesoftware/smackx/LastActivityManager.java +++ b/source/org/jivesoftware/smackx/LastActivityManager.java @@ -75,8 +75,8 @@ public class LastActivityManager { // Enable the LastActivity support on every established connection static { - XMPPConnection.addConnectionEstablishedListener(new ConnectionEstablishedListener() { - public void connectionEstablished(XMPPConnection connection) { + XMPPConnection.addConnectionCreationListener(new ConnectionCreationListener() { + public void connectionCreated(XMPPConnection connection) { new LastActivityManager(connection); } }); diff --git a/source/org/jivesoftware/smackx/ServiceDiscoveryManager.java b/source/org/jivesoftware/smackx/ServiceDiscoveryManager.java index 9e6bbdcdc..b1ca81123 100644 --- a/source/org/jivesoftware/smackx/ServiceDiscoveryManager.java +++ b/source/org/jivesoftware/smackx/ServiceDiscoveryManager.java @@ -59,8 +59,8 @@ public class ServiceDiscoveryManager { // Create a new ServiceDiscoveryManager on every established connection static { - XMPPConnection.addConnectionEstablishedListener(new ConnectionEstablishedListener() { - public void connectionEstablished(XMPPConnection connection) { + XMPPConnection.addConnectionCreationListener(new ConnectionCreationListener() { + public void connectionCreated(XMPPConnection connection) { new ServiceDiscoveryManager(connection); } }); diff --git a/source/org/jivesoftware/smackx/XHTMLManager.java b/source/org/jivesoftware/smackx/XHTMLManager.java index 064c03b43..c982fb128 100644 --- a/source/org/jivesoftware/smackx/XHTMLManager.java +++ b/source/org/jivesoftware/smackx/XHTMLManager.java @@ -20,11 +20,14 @@ package org.jivesoftware.smackx; -import java.util.Iterator; - -import org.jivesoftware.smack.*; +import org.jivesoftware.smack.ConnectionCreationListener; +import org.jivesoftware.smack.XMPPConnection; +import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.packet.Message; -import org.jivesoftware.smackx.packet.*; +import org.jivesoftware.smackx.packet.DiscoverInfo; +import org.jivesoftware.smackx.packet.XHTMLExtension; + +import java.util.Iterator; /** * Manages XHTML formatted texts within messages. A XHTMLManager provides a high level access to @@ -40,8 +43,8 @@ public class XHTMLManager { // Enable the XHTML support on every established connection // The ServiceDiscoveryManager class should have been already initialized static { - XMPPConnection.addConnectionListener(new ConnectionEstablishedListener() { - public void connectionEstablished(XMPPConnection connection) { + XMPPConnection.addConnectionListener(new ConnectionCreationListener() { + public void connectionCreated(XMPPConnection connection) { XHTMLManager.setServiceEnabled(connection, true); } }); diff --git a/source/org/jivesoftware/smackx/muc/MultiUserChat.java b/source/org/jivesoftware/smackx/muc/MultiUserChat.java index b582592b1..c99069c26 100644 --- a/source/org/jivesoftware/smackx/muc/MultiUserChat.java +++ b/source/org/jivesoftware/smackx/muc/MultiUserChat.java @@ -76,8 +76,8 @@ public class MultiUserChat { private List connectionListeners = new ArrayList(); static { - XMPPConnection.addConnectionEstablishedListener(new ConnectionEstablishedListener() { - public void connectionEstablished(final XMPPConnection connection) { + XMPPConnection.addConnectionCreationListener(new ConnectionCreationListener() { + public void connectionCreated(final XMPPConnection connection) { // Set on every established connection that this client supports the Multi-User // Chat protocol. This information will be used when another client tries to // discover whether this client supports MUC or not.