zdm/envoy
zdm
/
envoy
Archived
3
Fork 0
Code Issues 22 Pull Requests Releases 1 Wiki Activity

Data initialization in GroupCreationTab works at the right time

This commit is contained in:
Maximilian P. Käfer 2020-08-23 20:26:22 +02:00
parent bd75da1ab9
commit 14ccf4ce58
3 changed files with 39 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
client/src/main/java/envoy/client/event/LoadGroupCreationEvent.java Normal file
View File

@ -0,0 +1,24 @@
package envoy.client.event;
import envoy.client.data.LocalDB;
import envoy.event.Event;
/**
* Project: <strong>client</strong><br>
* File: <strong>LoadGroupCreationEvent.java</strong><br>
* Created: <strong>Aug 23, 2020</strong><br>
*
* @author Maximilian K&auml;fer
* @since Envoy Client v0.2-beta
*/
public class LoadGroupCreationEvent extends Event<LocalDB>{
private static final long serialVersionUID = 0L;
/**
* @param value the localDB
* @since Envoy Client v0.2-beta
*/
public LoadGroupCreationEvent(LocalDB value) { super(value); }
}

6
client/src/main/java/envoy/client/ui/controller/ChatScene.java
View File

@ -40,9 +40,7 @@ import envoy.client.data.*;
import envoy.client.data.audio.AudioRecorder; import envoy.client.data.audio.AudioRecorder;
import envoy.client.data.commands.SystemCommandBuilder; import envoy.client.data.commands.SystemCommandBuilder;
import envoy.client.data.commands.SystemCommandsMap; import envoy.client.data.commands.SystemCommandsMap;
import envoy.client.event.BackEvent; import envoy.client.event.*;
import envoy.client.event.MessageCreationEvent;
import envoy.client.event.SendEvent;
import envoy.client.net.Client; import envoy.client.net.Client;
import envoy.client.net.WriteProxy; import envoy.client.net.WriteProxy;
import envoy.client.ui.*; import envoy.client.ui.*;
@ -407,7 +405,7 @@ public final class ChatScene implements Restorable {
@FXML @FXML
private void groupCreationButtonClicked() { private void groupCreationButtonClicked() {
//TODO: initialize Data eventBus.dispatch(new LoadGroupCreationEvent(localDB));
tabPane.getSelectionModel().select(2); tabPane.getSelectionModel().select(2);
} }

30
client/src/main/java/envoy/client/ui/controller/GroupCreationTab.java
View File

@ -12,6 +12,7 @@ import javafx.scene.control.Alert.AlertType;
import envoy.client.data.Chat; import envoy.client.data.Chat;
import envoy.client.data.LocalDB; import envoy.client.data.LocalDB;
import envoy.client.event.BackEvent; import envoy.client.event.BackEvent;
import envoy.client.event.LoadGroupCreationEvent;
import envoy.client.event.SendEvent; import envoy.client.event.SendEvent;
import envoy.client.ui.SceneContext; import envoy.client.ui.SceneContext;
import envoy.client.ui.listcell.ContactControl; import envoy.client.ui.listcell.ContactControl;
@ -58,23 +59,18 @@ public class GroupCreationTab {
private void initialize() { private void initialize() {
userList.setCellFactory(new ListCellFactory<>(ContactControl::new)); userList.setCellFactory(new ListCellFactory<>(ContactControl::new));
userList.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE); userList.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
}
eventBus.register(LoadGroupCreationEvent.class, e -> {
/** this.localDB = e.get();
* @param localDB the local database from which potential group members can Platform.runLater(() -> userList.getItems()
* be selected .addAll(localDB.getChats()
* @since Envoy Client v0.1-beta .stream()
*/ .map(Chat::getRecipient)
public void initializeData(LocalDB localDB) { .filter(User.class::isInstance)
this.localDB = localDB; .filter(not(localDB.getUser()::equals))
Platform.runLater(() -> userList.getItems() .map(User.class::cast)
.addAll(localDB.getChats() .collect(Collectors.toList())));
.stream() });
.map(Chat::getRecipient)
.filter(User.class::isInstance)
.filter(not(localDB.getUser()::equals))
.map(User.class::cast)
.collect(Collectors.toList())));
} }
/** /**