From 9022c9012edfd915545c464b7bf40d15cebf7de4 Mon Sep 17 00:00:00 2001
From: Sony <faraz.ghahremani@yahoo.com>
Date: Fri, 24 Jul 2020 11:58:24 +0430
Subject: [PATCH] back button added in chat menu

---
 .idea/workspace.xml                     | 31 +++++++++++--------------
 src/main/java/Model/Messaging/Chat.java |  7 ++++++
 src/main/java/View/Menu/ChatMenu.java   |  8 ++++++-
 3 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5b25b82..64ff424 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aeefa500-3a99-4ed0-98cf-a7157d1fa89a" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/java/Controller/ChatManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Controller/ClientThread.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Controller/ClientThread.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Controller/Database.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Controller/Database.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Model/Messaging/Chat.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Model/Messaging/Chat.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/View/Menu/ChatMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/View/Menu/ChatMenu.java" afterDir="false" />
     </list>
@@ -371,13 +368,6 @@
       <workItem from="1595246472217" duration="1537000" />
       <workItem from="1595398225651" duration="1068000" />
     </task>
-    <task id="LOCAL-00057" summary="complete tests and menus">
-      <created>1589828474462</created>
-      <option name="number" value="00057" />
-      <option name="presentableId" value="LOCAL-00057" />
-      <option name="project" value="LOCAL" />
-      <updated>1589828474462</updated>
-    </task>
     <task id="LOCAL-00058" summary="add OffMenu">
       <created>1589833893359</created>
       <option name="number" value="00058" />
@@ -714,7 +704,14 @@
       <option name="project" value="LOCAL" />
       <updated>1595403371500</updated>
     </task>
-    <option name="localTasksCounter" value="106" />
+    <task id="LOCAL-00106" summary="chatMenu implemented">
+      <created>1595574630344</created>
+      <option name="number" value="00106" />
+      <option name="presentableId" value="LOCAL-00106" />
+      <option name="project" value="LOCAL" />
+      <updated>1595574630344</updated>
+    </task>
+    <option name="localTasksCounter" value="107" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -722,7 +719,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="complete show product for manager" />
     <MESSAGE value="product Menu" />
     <MESSAGE value="edit something" />
     <MESSAGE value="complete ProductMenu" />
@@ -747,7 +743,8 @@
     <MESSAGE value="show auctions for buyer" />
     <MESSAGE value="complete Auction" />
     <MESSAGE value="multiple chat implemented" />
-    <option name="LAST_COMMIT_MESSAGE" value="multiple chat implemented" />
+    <MESSAGE value="chatMenu implemented" />
+    <option name="LAST_COMMIT_MESSAGE" value="chatMenu implemented" />
   </component>
   <component name="WindowStateProjectService">
     <state x="280" y="20" key="#AccountManagerTest" timestamp="1589226101281">
@@ -844,10 +841,10 @@
     </state>
     <state x="130" y="260" width="1182" height="544" key="#com.intellij.execution.junit2.states.ComparisonFailureState$DiffDialog/0.0.1366.728@0.0.1366.728" timestamp="1589918033880" />
     <state x="130" y="264" width="1182" height="552" key="#com.intellij.execution.junit2.states.ComparisonFailureState$DiffDialog/0.0.1366.738@0.0.1366.738" timestamp="1593156646580" />
-    <state x="488" y="72" key="#com.intellij.ide.util.MemberChooser" timestamp="1595571280402">
+    <state x="488" y="72" key="#com.intellij.ide.util.MemberChooser" timestamp="1595575369541">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state x="488" y="72" key="#com.intellij.ide.util.MemberChooser/0.0.1366.728@0.0.1366.728" timestamp="1595571280402" />
+    <state x="488" y="72" key="#com.intellij.ide.util.MemberChooser/0.0.1366.728@0.0.1366.728" timestamp="1595575369541" />
     <state x="488" y="73" key="#com.intellij.ide.util.MemberChooser/0.0.1366.738@0.0.1366.738" timestamp="1593148011683" />
     <state x="412" y="143" key="#com.intellij.ide.util.PackageChooserDialog" timestamp="1589230984213">
       <screen x="0" y="0" width="1366" height="738" />
@@ -888,10 +885,10 @@
       <screen x="0" y="0" width="1366" height="728" />
     </state>
     <state x="438" y="65" key="#xdebugger.evaluate/0.0.1366.728@0.0.1366.728" timestamp="1594728596073" />
-    <state x="499" y="0" key="CommitChangelistDialog2" timestamp="1595574584651">
+    <state x="499" y="0" key="CommitChangelistDialog2" timestamp="1595574623781">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state x="499" y="0" key="CommitChangelistDialog2/0.0.1366.728@0.0.1366.728" timestamp="1595574584651" />
+    <state x="499" y="0" key="CommitChangelistDialog2/0.0.1366.728@0.0.1366.728" timestamp="1595574623781" />
     <state x="470" y="0" key="CommitChangelistDialog2/0.0.1366.738@0.0.1366.738" timestamp="1595399013745" />
     <state x="92" y="93" width="1182" height="552" key="DiffContextDialog" timestamp="1593178422199">
       <screen x="0" y="0" width="1366" height="738" />
diff --git a/src/main/java/Model/Messaging/Chat.java b/src/main/java/Model/Messaging/Chat.java
index 3a3be98..97c96c8 100644
--- a/src/main/java/Model/Messaging/Chat.java
+++ b/src/main/java/Model/Messaging/Chat.java
@@ -1,6 +1,7 @@
 package Model.Messaging;
 
 import Model.Account.Account;
+import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.TextField;
@@ -14,6 +15,7 @@ public class Chat {
     private ArrayList<Account> members;
     private TextField textField;
     private int id;
+    private Button back = new Button("Back");
 
     public TextField getTextField() {
         return textField;
@@ -62,8 +64,13 @@ public ScrollPane showChat() {
         }
         TextField textField = new TextField();
         this.textField = textField;
+        vBox.getChildren().add(back);
         vBox.getChildren().add(textField);
         chatRoom.setContent(vBox);
         return chatRoom;
     }
+
+    public Button getBackButton() {
+        return back;
+    }
 }
diff --git a/src/main/java/View/Menu/ChatMenu.java b/src/main/java/View/Menu/ChatMenu.java
index eb591be..7ebcf2c 100644
--- a/src/main/java/View/Menu/ChatMenu.java
+++ b/src/main/java/View/Menu/ChatMenu.java
@@ -30,8 +30,13 @@ public void show() {
         window.setScene(scene);
     }
 
-    public void run() {
+    @Override
+    public void execute() {
         TextField textField = chat.getTextField();
+        chat.getBackButton().setOnAction(e -> {
+            parentMenu.show();
+            parentMenu.execute();
+        });
         textField.setOnAction(e -> {
             // if e == enter.key
             chat.addMessage(new Message(account, textField.getText()));
@@ -51,6 +56,7 @@ private void setChat()  {
         try {
             dataOutputStream.writeUTF("getChatById " + chatId);
             String input = dataInputStream.readUTF();
+            if (input == null) return;
             Type type = new TypeToken<Chat>(){}.getType();
             Chat updatedChat = new Gson().fromJson(input, type);
             chat = updatedChat;