chat bug fixed

alishirmohammadi · alishirmohammadi · commit b4edaec9651f · 2019-07-08T23:56:04.000+04:30
diff --git a/src/client/controllers/ChatClient.java b/src/client/controllers/ChatClient.java
@@ -9,7 +9,7 @@ public class ChatClient {
     public static Response sendMessage(String message) {
         ServerConnection serverConnection = new ServerConnection("/chat/send_message");
         serverConnection.parameters.put("token", token);
-        serverConnection.parameters.put("message", message);
+        serverConnection.parameters.put("text", message);
         return serverConnection.getResponse();
     }
 
diff --git a/src/client/layouts/match_select.fxml b/src/client/layouts/match_select.fxml
@@ -21,40 +21,8 @@
             <VBox alignment="center" spacing="10">
                 <JFXTextField prefWidth="1000" text="salam" styleClass="input-text" onAction="#sendMessage" fx:id="messageField"/>
                 <ScrollPane prefHeight="250" styleClass="scroll-pane" style="-fx-background-color: transparent">
-                    <VBox style="-fx-background-color: transparent;" fx:id="chats">
-                        <HBox alignment="CENTER_RIGHT" styleClass="chat-container">
-                            <Label styleClass="chat-message, chat-right" text="salam"/>
-                        </HBox>
-                        <HBox alignment="CENTER_LEFT" styleClass="chat-container">
-                            <Label styleClass="chat-message, chat-left" text="salam"/>
-                        </HBox>
-                        <HBox alignment="CENTER_RIGHT" styleClass="chat-container">
-                            <Label styleClass="chat-message, chat-right" text="salam"/>
-                        </HBox>
-                        <HBox alignment="CENTER_LEFT" styleClass="chat-container">
-                            <Label styleClass="chat-message, chat-left" text="salam"/>
-                        </HBox>
-                        <HBox alignment="CENTER_RIGHT" styleClass="chat-container">
-                            <Label styleClass="chat-message, chat-right" text="salam"/>
-                        </HBox>
-                        <HBox alignment="CENTER_LEFT" styleClass="chat-container">
-                            <Label styleClass="chat-message, chat-left" text="salam"/>
-                        </HBox>
-                        <HBox alignment="CENTER_RIGHT" styleClass="chat-container">
-                            <Label styleClass="chat-message, chat-right" text="salamsallamsalamsalamsalamsalamsalamsalamsalamsalamsalamsalamsalamsalamsalamsalamsalamsalamsalamsalamsalamsalamsalamsalamsalamsalamsalamsalamsalamsa"/>
-                        </HBox>
-                        <HBox alignment="CENTER_LEFT" styleClass="chat-container">
-                            <Label styleClass="chat-message, chat-left" text="salam"/>
-                        </HBox>
-                        <HBox alignment="CENTER_RIGHT" styleClass="chat-container">
-                            <Label styleClass="chat-message, chat-right" text="salam"/>
-                        </HBox>
-                        <HBox alignment="CENTER_LEFT" styleClass="chat-container">
-                            <Label styleClass="chat-message, chat-left" text="salam"/>
-                        </HBox>
-                        <HBox alignment="CENTER_RIGHT" styleClass="chat-container">
-                            <Label styleClass="chat-message, chat-right" text="salam"/>
-                        </HBox>
+                    <VBox style="-fx-background-color: transparent;" spacing="4" fx:id="chats">
+
                     </VBox>
                 </ScrollPane>
             </VBox>
diff --git a/src/client/views/graphics/GraphicPreBattleMenu.java b/src/client/views/graphics/GraphicPreBattleMenu.java
@@ -108,6 +108,7 @@ public void backToMainMenu(MouseEvent mouseEvent) {
 
     public void sendMessage(ActionEvent actionEvent) {
         String message = messageField.getText();
+        messageField.setText("");
         ChatClient.sendMessage(message);
         Platform.runLater(this::updateMessage);
     }
@@ -118,10 +119,7 @@ private void updateMessage() {
         if (update != null) {
             for (int i = update.messages.size() - 1; i >= 0; i--) {
                 chats.getChildren().add(getMessageView(update.messages.get(i)));
-                System.out.println(update.messages.get(i).text);
             }
-        } else {
-            System.out.println("update is null");
         }
     }
 
@@ -142,7 +140,6 @@ public HBox getMessageView(Message message) {
 
     @Override
     public void initialize(URL location, ResourceBundle resources) {
-
         ScheduledThreadPoolExecutor waitingAnimation = new ScheduledThreadPoolExecutor(1);
         if (chats != null)
             waitingAnimation.scheduleAtFixedRate(() -> Platform.runLater(this::updateMessage), 0, 1, TimeUnit.SECONDS);

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public class ChatClient {`
`9`	`9`	`public static Response sendMessage(String message) {`
`10`	`10`	`ServerConnection serverConnection = new ServerConnection("/chat/send_message");`
`11`	`11`	`serverConnection.parameters.put("token", token);`
`12`		`- serverConnection.parameters.put("message", message);`
	`12`	`+ serverConnection.parameters.put("text", message);`
`13`	`13`	`return serverConnection.getResponse();`
`14`	`14`	`}`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,7 @@ public void backToMainMenu(MouseEvent mouseEvent) {`
`108`	`108`
`109`	`109`	`public void sendMessage(ActionEvent actionEvent) {`
`110`	`110`	`String message = messageField.getText();`
	`111`	`+ messageField.setText("");`
`111`	`112`	`ChatClient.sendMessage(message);`
`112`	`113`	`Platform.runLater(this::updateMessage);`
`113`	`114`	`}`
`@@ -118,10 +119,7 @@ private void updateMessage() {`
`118`	`119`	`if (update != null) {`
`119`	`120`	`for (int i = update.messages.size() - 1; i >= 0; i--) {`
`120`	`121`	`chats.getChildren().add(getMessageView(update.messages.get(i)));`
`121`		`- System.out.println(update.messages.get(i).text);`
`122`	`122`	`}`
`123`		`- } else {`
`124`		`- System.out.println("update is null");`
`125`	`123`	`}`
`126`	`124`	`}`
`127`	`125`
`@@ -142,7 +140,6 @@ public HBox getMessageView(Message message) {`
`142`	`140`
`143`	`141`	`@Override`
`144`	`142`	`public void initialize(URL location, ResourceBundle resources) {`
`145`		`-`
`146`	`143`	`ScheduledThreadPoolExecutor waitingAnimation = new ScheduledThreadPoolExecutor(1);`
`147`	`144`	`if (chats != null)`
`148`	`145`	`waitingAnimation.scheduleAtFixedRate(() -> Platform.runLater(this::updateMessage), 0, 1, TimeUnit.SECONDS);`