Skip to content

Commit b4edaec

Browse files
alishirmohammadialishirmohammadi
committed
chat bug fixed
1 parent 1968d30 commit b4edaec

3 files changed

Lines changed: 4 additions & 39 deletions

File tree

‎src/client/controllers/ChatClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class ChatClient {
99
public static Response sendMessage(String message) {
1010
ServerConnection serverConnection = new ServerConnection("/chat/send_message");
1111
serverConnection.parameters.put("token", token);
12-
serverConnection.parameters.put("message", message);
12+
serverConnection.parameters.put("text", message);
1313
return serverConnection.getResponse();
1414
}
1515

‎src/client/layouts/match_select.fxml‎

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -21,40 +21,8 @@
2121
<VBox alignment="center" spacing="10">
2222
<JFXTextField prefWidth="1000" text="salam" styleClass="input-text" onAction="#sendMessage" fx:id="messageField"/>
2323
<ScrollPane prefHeight="250" styleClass="scroll-pane" style="-fx-background-color: transparent">
24-
<VBox style="-fx-background-color: transparent;" fx:id="chats">
25-
<HBox alignment="CENTER_RIGHT" styleClass="chat-container">
26-
<Label styleClass="chat-message, chat-right" text="salam"/>
27-
</HBox>
28-
<HBox alignment="CENTER_LEFT" styleClass="chat-container">
29-
<Label styleClass="chat-message, chat-left" text="salam"/>
30-
</HBox>
31-
<HBox alignment="CENTER_RIGHT" styleClass="chat-container">
32-
<Label styleClass="chat-message, chat-right" text="salam"/>
33-
</HBox>
34-
<HBox alignment="CENTER_LEFT" styleClass="chat-container">
35-
<Label styleClass="chat-message, chat-left" text="salam"/>
36-
</HBox>
37-
<HBox alignment="CENTER_RIGHT" styleClass="chat-container">
38-
<Label styleClass="chat-message, chat-right" text="salam"/>
39-
</HBox>
40-
<HBox alignment="CENTER_LEFT" styleClass="chat-container">
41-
<Label styleClass="chat-message, chat-left" text="salam"/>
42-
</HBox>
43-
<HBox alignment="CENTER_RIGHT" styleClass="chat-container">
44-
<Label styleClass="chat-message, chat-right" text="salamsallamsalamsalamsalamsalamsalamsalamsalamsalamsalamsalamsalamsalamsalamsalamsalamsalamsalamsalamsalamsalamsalamsalamsalamsalamsalamsalamsalamsa"/>
45-
</HBox>
46-
<HBox alignment="CENTER_LEFT" styleClass="chat-container">
47-
<Label styleClass="chat-message, chat-left" text="salam"/>
48-
</HBox>
49-
<HBox alignment="CENTER_RIGHT" styleClass="chat-container">
50-
<Label styleClass="chat-message, chat-right" text="salam"/>
51-
</HBox>
52-
<HBox alignment="CENTER_LEFT" styleClass="chat-container">
53-
<Label styleClass="chat-message, chat-left" text="salam"/>
54-
</HBox>
55-
<HBox alignment="CENTER_RIGHT" styleClass="chat-container">
56-
<Label styleClass="chat-message, chat-right" text="salam"/>
57-
</HBox>
24+
<VBox style="-fx-background-color: transparent;" spacing="4" fx:id="chats">
25+
5826
</VBox>
5927
</ScrollPane>
6028
</VBox>

‎src/client/views/graphics/GraphicPreBattleMenu.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ public void backToMainMenu(MouseEvent mouseEvent) {
108108

109109
public void sendMessage(ActionEvent actionEvent) {
110110
String message = messageField.getText();
111+
messageField.setText("");
111112
ChatClient.sendMessage(message);
112113
Platform.runLater(this::updateMessage);
113114
}
@@ -118,10 +119,7 @@ private void updateMessage() {
118119
if (update != null) {
119120
for (int i = update.messages.size() - 1; i >= 0; i--) {
120121
chats.getChildren().add(getMessageView(update.messages.get(i)));
121-
System.out.println(update.messages.get(i).text);
122122
}
123-
} else {
124-
System.out.println("update is null");
125123
}
126124
}
127125

@@ -142,7 +140,6 @@ public HBox getMessageView(Message message) {
142140

143141
@Override
144142
public void initialize(URL location, ResourceBundle resources) {
145-
146143
ScheduledThreadPoolExecutor waitingAnimation = new ScheduledThreadPoolExecutor(1);
147144
if (chats != null)
148145
waitingAnimation.scheduleAtFixedRate(() -> Platform.runLater(this::updateMessage), 0, 1, TimeUnit.SECONDS);

0 commit comments

Comments
 (0)