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

Compare commits

base: vergnet:12733c5eb4b1971542cd06905e5f2c118034f2ae
Branches Tags
vergnet:master
vergnet:subprojects
..
compare: vergnet:16664ed8a2edb5e27f1aafee915d3253cd5ce88d
Branches Tags
vergnet:master
vergnet:subprojects

No commits in common. "12733c5eb4b1971542cd06905e5f2c118034f2ae" and "16664ed8a2edb5e27f1aafee915d3253cd5ce88d" have entirely different histories.
12733c5eb4 ... 16664ed8a2

5 changed files with 9 additions and 9 deletions
Show stats Expand all files Collapse all files

3
client/src/main/java/fr/insa/clavardator/client/db/DatabaseController.java
View file

@ -1,7 +1,6 @@
package fr.insa.clavardator.client.db;
import fr.insa.clavardator.client.users.CurrentUser;
import fr.insa.clavardator.client.users.PeerUser;
import fr.insa.clavardator.lib.message.FileMessage;
import fr.insa.clavardator.lib.message.Message;
import fr.insa.clavardator.lib.users.User;
@ -204,7 +203,7 @@ public class DatabaseController {
while (res.next()) {
String id = res.getString("id");
String username = res.getString("username");
userList.add(new PeerUser(id, username));
userList.add(new User(id, username));
}
Log.v(getClass().getSimpleName(), userList.size() + " users fetched");

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

@ -15,13 +15,13 @@ public class DirectPeerConnection extends PeerConnection {
}
@Override
public void send(Serializable message, @Nullable SimpleCallback callback, @Nullable ErrorCallback errorCallback) {
protected void send(Serializable message, @Nullable SimpleCallback callback, @Nullable ErrorCallback errorCallback) {
connection.send(message, callback, errorCallback);
}
@Override
public void receive(TcpConnection.MessageReceivedCallback callback, ErrorCallback errorCallback) {
protected void receive(TcpConnection.MessageReceivedCallback callback, ErrorCallback errorCallback) {
connection.receive(callback, errorCallback);
}

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

@ -8,7 +8,7 @@ import org.jetbrains.annotations.Nullable;
import java.io.Serializable;
public abstract class PeerConnection {
public abstract void send(Serializable message, @Nullable SimpleCallback calback, @Nullable ErrorCallback errorCallback);
protected abstract void send(Serializable message, @Nullable SimpleCallback calback, @Nullable ErrorCallback errorCallback);
/**
* Subscribe to this user messages.
@ -17,7 +17,7 @@ public abstract class PeerConnection {
*
* @param errorCallback Callback on error
*/
public abstract void receive(TcpConnection.MessageReceivedCallback callback, ErrorCallback errorCallback);
protected abstract void receive(TcpConnection.MessageReceivedCallback callback, ErrorCallback errorCallback);
/**
* Close the connection and set state to disconnected

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

@ -18,13 +18,13 @@ public class ProxyPeerConnection extends PeerConnection {
}
@Override
public void send(Serializable message, @Nullable SimpleCallback callback, @Nullable ErrorCallback errorCallback) {
protected void send(Serializable message, @Nullable SimpleCallback callback, @Nullable ErrorCallback errorCallback) {
proxy.send(message, callback, errorCallback);
}
@Override
public void receive(TcpConnection.MessageReceivedCallback callback, ErrorCallback errorCallback) {
protected void receive(TcpConnection.MessageReceivedCallback callback, ErrorCallback errorCallback) {
proxy.receive(userId, callback, errorCallback);
}

3
lib/src/main/java/fr/insa/clavardator/lib/users/User.java
View file

@ -2,8 +2,9 @@ package fr.insa.clavardator.lib.users;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.io.Serializable;
public abstract class User {
public class User implements Serializable {
// Make this class observable
private final transient PropertyChangeSupport pcs = new PropertyChangeSupport(this);
private String username;