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

Compare commits

base: vergnet:81673e44b3e73f830d5373cab8cbc6cac1949698
Branches Tags
vergnet:master
vergnet:subprojects
..
compare: vergnet:1fe1681d8b9f04aa52c82800d240b93f0decf3b2
Branches Tags
vergnet:master
vergnet:subprojects

No commits in common. "81673e44b3e73f830d5373cab8cbc6cac1949698" and "1fe1681d8b9f04aa52c82800d240b93f0decf3b2" have entirely different histories.
81673e44b3 ... 1fe1681d8b

3 changed files with 12 additions and 23 deletions
Show stats Expand all files Collapse all files

1
src/main/java/fr/insa/clavardator/ui/users/UserActiveIndicatorController.java
View file

@ -34,6 +34,7 @@ public class UserActiveIndicatorController implements Initializable {
private void onStateChange(PropertyChangeEvent propertyChangeEvent) {
if (propertyChangeEvent.getPropertyName().equals("state")) {
final PeerUser.State newState = (PeerUser.State) propertyChangeEvent.getNewValue();
Log.v(this.getClass().getSimpleName(), "User state updated to " + newState.toString());
Platform.runLater(() -> updateState(newState == PeerUser.State.CONNECTED));
}
}

15
src/main/java/fr/insa/clavardator/ui/users/UserListItemController.java
View file

@ -3,11 +3,9 @@ package fr.insa.clavardator.ui.users;
import com.jfoenix.controls.JFXButton;
import fr.insa.clavardator.ui.ButtonPressEvent;
import fr.insa.clavardator.users.PeerUser;
import javafx.application.Platform;
import javafx.fxml.FXML;
import javafx.fxml.Initializable;
import java.beans.PropertyChangeEvent;
import java.net.URL;
import java.util.ResourceBundle;
@ -44,21 +42,8 @@ public class UserListItemController implements Initializable {
resetBackground();
}
private void onUsernameChange(PropertyChangeEvent propertyChangeEvent) {
if (propertyChangeEvent.getPropertyName().equals("username")) {
final String newUsername = (String) propertyChangeEvent.getNewValue();
Platform.runLater(() -> button.setText(newUsername));
}
}
public void setUser(PeerUser user) {
if (this.user != null) {
// remove old observer before setting new user
this.user.removeObserver(this::onUsernameChange);
}
this.user = user;
user.addObserver(this::onUsernameChange);
indicatorController.setUser(user);
button.setText(user.getUsername());
resetBackground();

19
src/main/java/fr/insa/clavardator/users/UserList.java
View file

@ -40,8 +40,10 @@ public class UserList {
Log.v(this.getClass().getSimpleName(), "Discovered new user: " + id);
final PeerUser finalUser = createNewUser(id);
if (finalUser != null) {
finalUser.connect(ipAddr, () ->
finalUser.addObserver(evt -> userChangeObserver(finalUser, evt)), errorCallback);
finalUser.connect(ipAddr, () -> {
notifyNewUserObservers(finalUser);
finalUser.addObserver(evt -> userChangeObserver(finalUser, evt));
}, errorCallback);
}
}, errorCallback);
}
@ -60,8 +62,10 @@ public class UserList {
Log.v(this.getClass().getSimpleName(), "new connection from user: " + id);
final PeerUser finalUser = createNewUser(id);
if (finalUser != null) {
finalUser.connect(clientSocket, () ->
finalUser.addObserver(evt -> userChangeObserver(finalUser, evt)), errorCallback);
finalUser.connect(clientSocket, () -> {
notifyNewUserObservers(finalUser);
finalUser.addObserver(evt -> userChangeObserver(finalUser, evt));
}, errorCallback);
}
},
errorCallback);
@ -80,9 +84,8 @@ public class UserList {
// else create it
if (user == null) {
// Username is set on TCP connection start
user = new PeerUser(id);
user = new PeerUser(id, "");
inactiveUsers.put(id, user);
notifyNewUserObservers(user);
}
return user;
@ -100,9 +103,9 @@ public class UserList {
// Connection handling
if (!inactiveUsers.containsKey(id)) {
if (activeUsers.containsKey(id)) {
Log.w(getClass().getSimpleName(), "Tried to set state CONNECTED on an already connected user: user id " + id);
Log.e(getClass().getSimpleName(), "Tried to set state CONNECTED on an already connected user: user id " + id);
} else {
Log.w(getClass().getSimpleName(), "Tried to set state CONNECTED on an unknown user: user id " + id);
Log.e(getClass().getSimpleName(), "Tried to set state CONNECTED on an unknown user: user id " + id);
}
return;
}