Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2025-12-12 08:01:08 +01:00
Code Issues Releases Wiki Activity

Refactoring: All connection classes begin with XMPP now

Browse source 
This commit renames classes as follows:
 * TCPConnection --> XMPPTCPConnection
 * BOSHConnection --> XMPPBOSHConnection

There are two reasons for this rename. First, it is there to indicate
that the classes actually _are_ XMPP connections, using different
transport mechanisms. Second, it makes auto-completion in IDEs easier,
the developer can type XMPP<complete> and choose the right backend.
This commit is contained in:
Georg Lukas 2014-04-09 12:16:44 +02:00 • committed by Florian Schmaus
parent c86d6e3b61
commit ab70cfec24
31 changed files with 120 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

10
jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleManagerTest.java
View file

@ -682,10 +682,10 @@ public class JingleManagerTest extends SmackTestCase {
resetCounter();
TCPConnection x0 = getConnection(0);
TCPConnection x1 = getConnection(1);
XMPPTCPConnection x0 = getConnection(0);
XMPPTCPConnection x1 = getConnection(1);
TCPConnection.DEBUG_ENABLED = true;
XMPPTCPConnection.DEBUG_ENABLED = true;
FixedResolver tr0 = new FixedResolver("127.0.0.1", 20080);
FixedTransportManager ftm0 = new FixedTransportManager(tr0);
@ -797,8 +797,8 @@ public class JingleManagerTest extends SmackTestCase {
resetCounter();
TCPConnection x0 = getConnection(0);
TCPConnection x1 = getConnection(1);
XMPPTCPConnection x0 = getConnection(0);
XMPPTCPConnection x1 = getConnection(1);
FixedResolver tr0 = new FixedResolver("127.0.0.1", 20004);
FixedTransportManager ftm0 = new FixedTransportManager(tr0);

24
jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleMediaTest.java
View file

@ -52,8 +52,8 @@ public class JingleMediaTest extends SmackTestCase {
public void testCompleteJmf() {
TCPConnection x0 = getConnection(0);
TCPConnection x1 = getConnection(1);
XMPPTCPConnection x0 = getConnection(0);
XMPPTCPConnection x1 = getConnection(1);
for (int i = 0; i < 1; i++)
try {
@ -131,8 +131,8 @@ public class JingleMediaTest extends SmackTestCase {
try {
TCPConnection x0 = getConnection(0);
TCPConnection x1 = getConnection(1);
XMPPTCPConnection x0 = getConnection(0);
XMPPTCPConnection x1 = getConnection(1);
ICETransportManager icetm0 = new ICETransportManager(x0, "jivesoftware.com", 3478);
ICETransportManager icetm1 = new ICETransportManager(x1, "jivesoftware.com", 3478);
@ -214,8 +214,8 @@ public class JingleMediaTest extends SmackTestCase {
//TCPConnection.DEBUG_ENABLED = true;
TCPConnection x0 = getConnection(0);
TCPConnection x1 = getConnection(1);
XMPPTCPConnection x0 = getConnection(0);
XMPPTCPConnection x1 = getConnection(1);
JingleMediaManager jingleMediaManager0 = new SpeexMediaManager(new STUNTransportManager());
JingleMediaManager jingleMediaManager1 = new SpeexMediaManager(new STUNTransportManager());
@ -266,8 +266,8 @@ public class JingleMediaTest extends SmackTestCase {
try {
TCPConnection x0 = getConnection(0);
TCPConnection x1 = getConnection(1);
XMPPTCPConnection x0 = getConnection(0);
XMPPTCPConnection x1 = getConnection(1);
ICETransportManager icetm0 = new ICETransportManager(x0, "stun.xten.net", 3478);
ICETransportManager icetm1 = new ICETransportManager(x1, "stun.xten.net", 3478);
@ -325,8 +325,8 @@ public class JingleMediaTest extends SmackTestCase {
public void run() {
try {
TCPConnection x0 = getConnection(n);
TCPConnection x1 = getConnection(n + 1);
XMPPTCPConnection x0 = getConnection(n);
XMPPTCPConnection x1 = getConnection(n + 1);
BridgedTransportManager btm0 = new BridgedTransportManager(x0);
BridgedTransportManager btm1 = new BridgedTransportManager(x1);
@ -401,8 +401,8 @@ public class JingleMediaTest extends SmackTestCase {
//TCPConnection.DEBUG_ENABLED = true;
TCPConnection x0 = getConnection(0);
TCPConnection x1 = getConnection(1);
XMPPTCPConnection x0 = getConnection(0);
XMPPTCPConnection x1 = getConnection(1);
BridgedTransportManager btm0 = new BridgedTransportManager(x0);
BridgedTransportManager btm1 = new BridgedTransportManager(x1);