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

Merge branch 'develop' into f/logout

Browse Source 
Conflicts:
	client/src/main/java/envoy/client/data/CacheMap.java
	client/src/main/java/envoy/client/data/commands/SystemCommandsMap.java
	client/src/main/java/envoy/client/net/Client.java
	client/src/main/java/envoy/client/ui/Startup.java
	client/src/main/java/envoy/client/ui/StatusTrayIcon.java
	client/src/main/java/envoy/client/ui/controller/ChatScene.java
	client/src/main/java/envoy/client/ui/controller/ContactSearchTab.java
This commit is contained in:
Kai S. K. Engelbart
2020-09-27 15:20:19 +02:00
parent 61fbeda05e d1d52468bc
commit d70a848ef3
140 changed files with 482 additions and 1518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
client/src/main/java/envoy/client/ui/controller/ContactSearchTab.java
View File

@@ -7,9 +7,12 @@ import javafx.fxml.FXML;
import javafx.scene.control.*;
import javafx.scene.control.Alert.AlertType;
import envoy.client.event.*;
import envoy.client.data.Context;
import envoy.client.event.BackEvent;
import envoy.client.helper.AlertHelper;
import envoy.client.ui.listcell.*;
import envoy.client.net.Client;
import envoy.client.ui.control.ContactControl;
import envoy.client.ui.listcell.ListCellFactory;
import envoy.data.User;
import envoy.event.ElementOperation;
import envoy.event.contact.*;
@@ -26,10 +29,6 @@ import dev.kske.eventbus.*;
* <p>
* To create a group, a button is available that loads the
* {@link GroupCreationTab}.
* <p>
* Project: <strong>envoy-client</strong><br>
* File: <strong>ContactSearchScene.java</strong><br>
* Created: <strong>07.06.2020</strong><br>
*
* @author Leon Hofmeister
* @author Maximilian K&auml;fer
@@ -47,6 +46,7 @@ public class ContactSearchTab implements EventListener {
private final Alert alert = new Alert(AlertType.CONFIRMATION);
private static final Client client = Context.getInstance().getClient();
private static final EventBus eventBus = EventBus.getInstance();
private static final Logger logger = EnvoyLog.getLogger(ChatScene.class);
@@ -79,7 +79,7 @@ public class ContactSearchTab implements EventListener {
@FXML
private void sendRequest() {
final var text = searchBar.getText().strip();
if (!text.isBlank()) eventBus.dispatch(new SendEvent(new UserSearchRequest(text)));
if (!text.isBlank()) client.send(new UserSearchRequest(text));
else userList.getItems().clear();
}
@@ -115,7 +115,7 @@ public class ContactSearchTab implements EventListener {
// Sends the event to the server
final var event = new ContactOperation(currentlySelectedUser, ElementOperation.ADD);
eventBus.dispatch(new SendEvent(event));
client.send(event);
// Removes the chosen user and updates the UI
userList.getItems().remove(currentlySelectedUser);