vergnet/clavardator
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'origin/subprojects' into subprojects

Browse source
This commit is contained in:
Arnaud Vergnet 2021-01-31 17:18:24 +01:00
commit 2fc3a00264
4 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
client/src/main/java/fr/insa/clavardator/client/users/DirectPeerConnection.java
View file

@ -10,8 +10,7 @@ import java.io.Serializable;
public class DirectPeerConnection extends PeerConnection { public class DirectPeerConnection extends PeerConnection {
private final TcpConnection connection; private final TcpConnection connection;
public DirectPeerConnection(TcpConnection connection, PeerUser user) { public DirectPeerConnection(TcpConnection connection) {
super(user);
this.connection = connection; this.connection = connection;
} }

6
client/src/main/java/fr/insa/clavardator/client/users/PeerConnection.java
View file

@ -8,12 +8,6 @@ import org.jetbrains.annotations.Nullable;
import java.io.Serializable; import java.io.Serializable;
public abstract class PeerConnection { public abstract class PeerConnection {
protected final PeerUser user;
protected PeerConnection(PeerUser user) {
this.user = user;
}
protected abstract void send(Serializable message, @Nullable SimpleCallback calback, @Nullable ErrorCallback errorCallback); protected abstract void send(Serializable message, @Nullable SimpleCallback calback, @Nullable ErrorCallback errorCallback);
/** /**

4
client/src/main/java/fr/insa/clavardator/client/users/PeerUser.java
View file

@ -49,12 +49,12 @@ public class PeerUser extends User implements Comparable<PeerUser> {
} }
public void init(TcpConnection tcpConnection, String id, String username, ErrorCallback errorCallback) { public void init(TcpConnection tcpConnection, String id, String username, ErrorCallback errorCallback) {
connection = new DirectPeerConnection(tcpConnection, this); connection = new DirectPeerConnection(tcpConnection);
init(id, username, errorCallback); init(id, username, errorCallback);
} }
public void init(Proxy proxy, String id, String username, ErrorCallback errorCallback) { public void init(Proxy proxy, String id, String username, ErrorCallback errorCallback) {
connection = new ProxyPeerConnection(proxy, this); connection = new ProxyPeerConnection(proxy, getId());
init(id, username, errorCallback); init(id, username, errorCallback);
} }

9
client/src/main/java/fr/insa/clavardator/client/users/ProxyPeerConnection.java
View file

@ -10,10 +10,11 @@ import java.io.Serializable;
public class ProxyPeerConnection extends PeerConnection { public class ProxyPeerConnection extends PeerConnection {
private final Proxy proxy; private final Proxy proxy;
private final String userId;
public ProxyPeerConnection(Proxy proxy, PeerUser user) { public ProxyPeerConnection(Proxy proxy, String userId) {
super(user);
this.proxy = proxy; this.proxy = proxy;
this.userId = userId;
} }
@Override @Override
@ -24,11 +25,11 @@ public class ProxyPeerConnection extends PeerConnection {
@Override @Override
protected void receive(TcpConnection.MessageReceivedCallback callback, ErrorCallback errorCallback) { protected void receive(TcpConnection.MessageReceivedCallback callback, ErrorCallback errorCallback) {
proxy.receive(user.getId(), callback, errorCallback); proxy.receive(userId, callback, errorCallback);
} }
@Override @Override
public void disconnect() { public void disconnect() {
proxy.disconnectUser(user.getId()); proxy.disconnectUser(userId);
} }
} }