Skip to content

Commit 0783514

Browse files
authored
Don't bind users to prompt text (#3108)
1 parent c46d11a commit 0783514

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/main/java/com/faforever/client/chat/ChatUserListController.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,7 @@ protected void onInitialize() {
117117
.orElse(FXCollections.observableSet())
118118
.when(showing));
119119

120-
searchUsernameTextField.promptTextProperty()
121-
.bind(users.flatMap(Bindings::size)
122-
.map(size -> i18n.get("chat.userCount", size))
123-
.when(showing));
120+
searchUsernameTextField.setPromptText(i18n.get("chat.search.prompt"));
124121

125122
users.when(showing).subscribe((oldValue, newValue) -> {
126123
unfilteredItems.removeIf(item -> item.user() != null);

src/main/java/com/faforever/client/chat/KittehChatService.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -540,12 +540,14 @@ private void onDisconnect(ClientConnectionEndedEvent event) {
540540
List.copyOf(channels.keySet()).forEach(this::removeChannel);
541541
connectionState.set(ConnectionState.DISCONNECTED);
542542
client.shutdown();
543+
event.getCause().ifPresent(throwable -> log.error("Chat disconnected with cause", throwable));
543544
}
544545

545546
@Handler
546547
private void onFailedConnect(ClientConnectionFailedEvent event) {
547548
connectionState.set(ConnectionState.DISCONNECTED);
548549
client.shutdown();
550+
event.getCause().ifPresent(throwable -> log.error("Chat disconnected with cause", throwable));
549551
}
550552

551553
private void onSocialMessage(SocialInfo socialMessage) {

src/main/resources/i18n/messages.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ chat.sendActionTask.title = Sending chat action…
116116
chat.clanTagFormat = [{0}]
117117
chat.imageUploadTask.title = Uploading image…
118118
chat.userCount = {0,number,#} users (type to search)
119+
chat.search.prompt=Search for user…
119120
chat.mapName = Map Name\: {0}
120121
chat.filter.filter = Filter
121122
chat.filter.prompt = Search in channel

0 commit comments

Comments
 (0)