litesoft
Diff Revisions
150
vs
151
for /trunk/Java/core/Server/src/org/litesoft/peertopeer/PeerManager.java
|
@@ -4,16 +4,15 @@ |
4 |
4 |
|
import java.io.*; |
5 |
5 |
|
import java.net.*; |
6 |
6 |
|
|
|
7 |
+ |
import org.litesoft.peertopeer.nonpublic.*; |
7 |
8 |
|
import org.litesoft.peertopeer.nonpublic.broadcastdiscovery.*; |
8 |
9 |
|
import org.litesoft.peertopeer.nonpublic.peermanagement.*; |
9 |
10 |
|
import org.litesoft.peertopeer.nonpublic.server.*; |
10 |
|
- |
import org.litesoft.peertopeer.nonpublic.*; |
11 |
11 |
|
import org.litesoft.util.*; |
12 |
12 |
|
|
13 |
13 |
|
public class PeerManager |
14 |
14 |
|
{ |
15 |
|
- |
public PeerManager( String pOurName, String pAppGroupID, String pAppGroupVersion, |
16 |
|
- |
AppGroupVersionCompatibilityChecker pCompatibilityChecker ) |
|
15 |
+ |
public PeerManager( String pOurName, String pAppGroupID, String pAppGroupVersion, AppGroupVersionCompatibilityChecker pCompatibilityChecker ) |
17 |
16 |
|
{ |
18 |
17 |
|
if ( pOurName == null ) |
19 |
18 |
|
{ |
|
@@ -50,8 +49,7 @@ |
50 |
49 |
|
{ |
51 |
50 |
|
mBroadcastMessageManager.assert_joinGroup_notCalled(); |
52 |
51 |
|
|
53 |
|
- |
mConnectionManager = new PeerConnectionManager( mHandlerManager, this, |
54 |
|
- |
pOKtoRunIfIncompatibleVersionAlreadyRunning ); |
|
52 |
+ |
mConnectionManager = new PeerConnectionManager( mHandlerManager, this, pOKtoRunIfIncompatibleVersionAlreadyRunning ); |
55 |
53 |
|
PeerConnectionHandlerFactory zHandlerFactory = new PeerConnectionHandlerFactory( mConnectionManager ); |
56 |
54 |
|
PeerServer zPeerServer = new PeerServer(); |
57 |
55 |
|
|