Minimal chat functinalities with bugs

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,36 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="JavaDoc" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="TOP_LEVEL_CLASS_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="INNER_CLASS_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="METHOD_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="@return@param@throws or @exception" />
+        </value>
+      </option>
+      <option name="FIELD_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="IGNORE_DEPRECATED" value="false" />
+      <option name="IGNORE_JAVADOC_PERIOD" value="true" />
+      <option name="IGNORE_DUPLICATED_THROWS" value="false" />
+      <option name="IGNORE_POINT_TO_ITSELF" value="false" />
+      <option name="myAdditionalJavadocTags" value="" />
+    </inspection_tool>
+  </profile>
+</component>

src/main/java/app/insa/clav/Core/Model.java

@@ -1,11 +1,14 @@
 package app.insa.clav.Core;
 
 import app.insa.clav.Messages.Message;
+import app.insa.clav.Messages.MessageChatTxt;
+import app.insa.clav.Messages.MessageInit;
 import app.insa.clav.Messages.MessagePseudo;
 import app.insa.clav.Reseau.TCPChatConnection;
 import app.insa.clav.Reseau.TCPListener;
 import app.insa.clav.Reseau.UDPInput;
 import app.insa.clav.Reseau.UDPOutput;
+import jdk.jshell.execution.Util;
 
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
@@ -81,16 +84,16 @@ public class Model implements PropertyChangeListener{
      *                  Port d'Output UDP
      */
 /*
-ID 1 -> Listening on 6000, sending on 5000
-ID 2 -> Listening on 6001, sending on 5001
-ID 2 -> Listening on 6002, sending on 5002
+ID 1 -> Listening on 6000, sending on 5000, tcpServer on 7000
+ID 2 -> Listening on 6001, sending on 5001, tcpServer on 7001
+ID 2 -> Listening on 6002, sending on 5002, tcpServer on 7002
 */
-    private Model(int id, int inputPort, int outputPort){
+    private Model(int id, int inputPort, int outputPort, int tcpListenerPort){
         try {
             this.user = new Utilisateurs("NA", InetAddress.getLocalHost(), id, inputPort);
             this.UDPOut = new UDPOutput(InetAddress.getLocalHost(), outputPort);
             this.UDPIn = new UDPInput(user.getInetAddress(),inputPort);
-            this.tcpListener = new TCPListener(this.user.getInetAddress(),this.user.getId());
+            this.tcpListener = new TCPListener(this.user.getInetAddress(),tcpListenerPort,user.getId());
             this.tim= new Timer();
             this.support = new PropertyChangeSupport(this);
         }
@@ -99,6 +102,7 @@ ID 2 -> Listening on 6002, sending on 5002
             e.printStackTrace();
         }
         this.userList = new ArrayList<Utilisateurs>();
+        this.listTCPConnection = new ArrayList<TCPChatConnection>();
     }
 
     /**
@@ -112,10 +116,10 @@ ID 2 -> Listening on 6002, sending on 5002
      * @return
      *         instance of Model
      */
-    public static Model getInstance(int id, int inputPort, int outputPort){
+    public static Model getInstance(int id, int inputPort, int outputPort, int tcpListenerPort){
         synchronized(Model.class){
             if (instance == null) {
-                instance = new Model(id, inputPort, outputPort);
+                instance = new Model(id, inputPort, outputPort,tcpListenerPort);
             }
         }
         return instance;
@@ -138,6 +142,7 @@ ID 2 -> Listening on 6002, sending on 5002
     }
 
     public void openTCPListener(){
+        System.out.println(("Start tcp listener"));
         tcpListener.start();
         this.tcpListener.addPropertyChangeListener(this);
     }
@@ -234,6 +239,28 @@ ID 2 -> Listening on 6002, sending on 5002
         return true;
     }
 
+
+    public void createChatFromLocalRequest(String remotePseudo){
+        for (Utilisateurs u : userList){
+            if (u.getPseudo().equals(remotePseudo)){
+                int destPort;
+                if (u.getId() == 1){
+                    destPort = 7000;
+                }
+                else if (u.getId() == 2){
+                    destPort = 7001;
+                }
+                else{
+                    destPort = 7002;
+                }
+                System.out.println("Dans le createChat du Model, avec dest : " +u.getId() + " " + remotePseudo + " "  +destPort);
+                MessageInit msgInit = new MessageInit(7,user.getInetAddress(),user.getPort(),u.getInetAddress(),destPort,user.getId());
+                TCPChatConnection tcpCo = new TCPChatConnection(msgInit,u.getId());
+                listTCPConnection.add(tcpCo);
+            }
+        }
+    }
+
     /**
      * Handler de notification (Obsevateur) pour le thread UDP.
      * @param evt
@@ -246,11 +273,10 @@ ID 2 -> Listening on 6002, sending on 5002
                 this.messageHandler(msgReceived);
                 break;
             case "chatCreated" :
+                System.out.println(("Dans le handler chatCreated receveur"));
                 TCPChatConnection tcpCo = this.tcpListener.getTCPChatConnection();
                 tcpCo.addPropertyChangeListener(this);
                 this.listTCPConnection.add(tcpCo);
-            case "TCPReceived" :
-                //Faire le handler de msgTCP
         }
     }
 
@@ -322,6 +348,17 @@ ID 2 -> Listening on 6002, sending on 5002
         return userList;
     }
 
+    public Utilisateurs getUserFromId(int id){
+        Utilisateurs res = null;
+        for (Utilisateurs u : userList){
+            if (u.getId() == id){
+                res = u;
+                break;
+            }
+        }
+        return res;
+    }
+
 
     /**
      * Classe interne au model pour au bout d'une seconde d'envoi de demande pseudo type 1,

src/main/java/app/insa/clav/Main.java

@@ -17,8 +17,9 @@ public class Main extends Application{
         int id = Integer.parseInt(args[0]);
         int inputPort = Integer.parseInt(args[1]);
         int outPutPort = Integer.parseInt(args[2]);
+        int tcpListenerPort = Integer.parseInt(args[3]);
 
-        Model model = Model.getInstance(id,inputPort, outPutPort);
+        Model model = Model.getInstance(id,inputPort, outPutPort,tcpListenerPort);
 
         FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("/fxml/splashScreen.fxml"));
         Parent root =fxmlLoader.load();

src/main/java/app/insa/clav/Messages/Message.java

@@ -10,6 +10,8 @@ import java.net.InetAddress;
     2 ---> Messages.MessagePseudo réponse à type 1 pseudo ok
     3 ---> Messages.MessagePseudo réponse à type 1 pseudo pas ok
     4 ---> Messages.MessagePseudo si après type 1 aucun type 2 pour un delai, envoi confirmation pseudo
+    5 ---> Message Init envoyé quand on se connecte en TCP à un user distant
+    6 ---> MessageChatTxt pour le chat
  */
 
 /**
@@ -28,8 +30,8 @@ public class Message implements Serializable {
     public int typeMessage;
     public InetAddress srcIP;
     public int srcResponsePort; //Seulement besoin car on teste en localHost
-    public InetAddress destIP;
-    public int destPort;
+    public InetAddress destIP; //Seulement pour UDP ou ouverture CO TCP
+    public int destPort; //Seulement pour UDP ou l'ouverture connexion TCP, sinon à 0.
 
     /**
      * Constructeur d'un message depuis un autre

src/main/java/app/insa/clav/Messages/MessageInit.java

@@ -4,7 +4,7 @@ import java.net.InetAddress;
 
 public class MessageInit extends Message{
 
-    int id;
+    public int id;
 
 
     public MessageInit(int typeMessage, InetAddress srcIP, int srcResponsePort, InetAddress destIP, int destPort, int localId) {

src/main/java/app/insa/clav/Reseau/TCPChatConnection.java

@@ -1,12 +1,16 @@
 package app.insa.clav.Reseau;
 import app.insa.clav.Messages.Message;
+import app.insa.clav.Messages.MessageChatTxt;
 import app.insa.clav.Messages.MessageInit;
+import app.insa.clav.UISubStages.ChatStage;
+import javafx.application.Platform;
 
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.net.InetAddress;
 import java.net.Socket;
 import java.util.ArrayList;
 
@@ -16,7 +20,7 @@ public class TCPChatConnection extends Thread{
     /**
      * Buffer dans lequel on met les messages reçus si ils passent le filter
      */
-    private ArrayList<Message> msgReceivedBuffer;
+    private final ArrayList<Message> msgReceivedBuffer;
 
     private Socket link;
 
@@ -32,15 +36,15 @@ public class TCPChatConnection extends Thread{
      * Constructeur utilisé quand l'utilisateur distant inititie la connexion
      * @param link
      */
-    public TCPChatConnection(Socket link){
+    public TCPChatConnection(Socket link, int remoteUserId, ObjectInputStream ois, ObjectOutputStream oos){
         this.link = link;
-        try {
-            this.objectOutStream = new ObjectOutputStream(this.link.getOutputStream());
-            this.objectInStream = new ObjectInputStream(this.link.getInputStream());
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
+        this.objectOutStream = oos;
+        this.objectInStream = ois;
         this.msgReceivedBuffer = new ArrayList<Message>();
+        this.remoteUserId = remoteUserId;
+        this.support = new PropertyChangeSupport(this);
+        Platform.runLater(() -> new ChatStage(this));
+        this.start();
     }
 
     /**
@@ -58,11 +62,15 @@ public class TCPChatConnection extends Thread{
         } catch (IOException e) {
             e.printStackTrace();
         }
+        this.msgReceivedBuffer = new ArrayList<Message>();
         this.remoteUserId = remoteUserId;
+        this.support = new PropertyChangeSupport(this);
+        Platform.runLater(() -> new ChatStage(this));
+        this.start();
     }
 
     public void addPropertyChangeListener(PropertyChangeListener pcl){
-        this.support.addPropertyChangeListener("TCPReceived",pcl);
+        this.support.addPropertyChangeListener("messageTextReceivedTCP",pcl);
     }
 
 
@@ -87,11 +95,12 @@ public class TCPChatConnection extends Thread{
                 e.printStackTrace();
             }
             this.msgReceivedBuffer.add(msgReceived);
-            this.support.firePropertyChange("TCPReceived",true,false);
+            this.support.firePropertyChange("messageTextReceivedTCP",true,false);
         }
     }
 
-    public void sendMessage(Message msg){
+    public void sendMessageTxt(String payload){
+        MessageChatTxt msg = new MessageChatTxt(6,this.link.getLocalAddress(),this.link.getLocalPort(),this.link.getInetAddress(),this.link.getPort(),payload);
         try {
             this.objectOutStream.writeObject(msg);
         } catch (IOException e) {

src/main/java/app/insa/clav/Reseau/TCPListener.java

@@ -6,6 +6,7 @@ import app.insa.clav.Messages.MessageInit;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.io.IOException;
+import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.net.InetAddress;
 import java.net.ServerSocket;
@@ -24,10 +25,10 @@ public class TCPListener extends Thread{
 
     private ArrayList<TCPChatConnection> bufferTCPConnection;
 
-    public TCPListener(InetAddress inetAddress, int localId){
+    public TCPListener(InetAddress inetAddress, int tcpListenerPort,int localId){
         this.inetAddress = inetAddress;
         try {
-            this.servSocket = new ServerSocket(0,1000,inetAddress); //0 alloue un port dispo
+            this.servSocket = new ServerSocket(tcpListenerPort,1000,inetAddress); //0 alloue un port dispo
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -57,11 +58,12 @@ public class TCPListener extends Thread{
             try {
                 Socket link = servSocket.accept();
                 ObjectOutputStream objectOutStream = new ObjectOutputStream(link.getOutputStream());
-                MessageInit msg = new MessageInit(7,this.inetAddress,0,link.getInetAddress(),link.getPort(),this.localId);
-                objectOutStream.writeObject(msg);
-                objectOutStream.close();
-                this.bufferTCPConnection.add(new TCPChatConnection(link));
-            } catch (IOException e) {
+                ObjectInputStream objectInStream = new ObjectInputStream(link.getInputStream());
+                MessageInit msgInit = (MessageInit) objectInStream.readObject();
+                int remoteUserId = msgInit.id;
+                this.bufferTCPConnection.add(new TCPChatConnection(link,remoteUserId,objectInStream,objectOutStream));
+                this.support.firePropertyChange("chatCreated",true,false);
+            } catch (IOException | ClassNotFoundException e) {
                 e.printStackTrace();
             }
         }

src/main/java/app/insa/clav/UIControllers/ChatWindowController.java

@@ -0,0 +1,85 @@
+package app.insa.clav.UIControllers;
+
+import app.insa.clav.Core.Model;
+import app.insa.clav.Core.Utilisateurs;
+import app.insa.clav.Messages.MessageChatTxt;
+import app.insa.clav.Messages.MessageInit;
+import app.insa.clav.Reseau.TCPChatConnection;
+import com.jfoenix.controls.JFXButton;
+import com.sun.javafx.collections.ImmutableObservableList;
+import javafx.application.Platform;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableArray;
+import javafx.collections.ObservableList;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.fxml.Initializable;
+import javafx.scene.control.ListView;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.AnchorPane;
+import javafx.stage.Stage;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.ResourceBundle;
+
+public class ChatWindowController implements Initializable, PropertyChangeListener {
+
+    @FXML
+    private AnchorPane rootAnchor;
+
+    private Model model;
+
+    private TCPChatConnection tcpCo;
+
+    private Utilisateurs remoteUser;
+
+
+    @FXML
+    private ListView<String> messageList;
+
+    @FXML
+    private TextField messageInput;
+
+    @FXML
+    private JFXButton sendButton;
+
+    private ObservableList<String> listMessages;
+
+
+    public ChatWindowController(){
+        this.model = Model.getInstance();
+    }
+
+    @Override
+    public void initialize(URL location, ResourceBundle resources) {
+        this.listMessages = FXCollections.observableList(new ArrayList<String>());
+        this.messageList.setItems(this.listMessages);
+    }
+
+    public void setTCPCo(TCPChatConnection tcpCo){
+        this.tcpCo = tcpCo;
+        tcpCo.addPropertyChangeListener(this);
+        int remoteUserId = tcpCo.remoteUserId;
+        this.remoteUser = model.getUserFromId(remoteUserId);
+    }
+
+    @Override
+    public void propertyChange(PropertyChangeEvent evt) {
+        switch(evt.getPropertyName()){
+            case "messageTextReceivedTCP" :
+                MessageChatTxt msg = (MessageChatTxt) tcpCo.getMessageReceived();
+                String payload = msg.payload;
+                Platform.runLater(() -> this.listMessages.add(payload));
+        }
+    }
+
+    public void buttonSendMessageClicked(ActionEvent actionEvent) {
+        String payload = model.user.getPseudo() + " : " + this.messageInput.getText();
+        this.listMessages.add(payload);
+        this.messageInput.clear();
+        this.tcpCo.sendMessageTxt(payload);
+    }
+}

src/main/java/app/insa/clav/UIControllers/MainDrawerController.java

@@ -57,7 +57,7 @@ public class MainDrawerController implements PropertyChangeListener,Initializabl
      * @param evt
      */
     public void buttonPseudoHandler(ActionEvent evt){
-        this.pseudoWindow = new PseudoStage(this.model);
+        this.pseudoWindow = new PseudoStage();
     }
 
     /**

src/main/java/app/insa/clav/UIControllers/MainWindowController.java

@@ -10,6 +10,7 @@ import javafx.animation.FadeTransition;
 import javafx.application.Platform;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
+import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.fxml.Initializable;
@@ -83,6 +84,11 @@ public class MainWindowController implements PropertyChangeListener, Initializab
      */
     private ObservableList<String> listUsers;
 
+
+    @FXML
+    private MenuItem openChatButton;
+
+
     /**
      * Contructeur. Il crée lui même l'UI (plus tard on mettra quel type de fenetre en argument)
      */
@@ -155,4 +161,10 @@ public class MainWindowController implements PropertyChangeListener, Initializab
         }
     }
 
+
+    @FXML
+    void openChat(ActionEvent event) {
+        System.out.println("Dans le hanlder bouton chat, pseudo demandé : " + userListView.getFocusModel().getFocusedItem());
+        model.createChatFromLocalRequest(userListView.getFocusModel().getFocusedItem());
+    }
 }

src/main/java/app/insa/clav/UISubStages/ChatStage.java

@@ -0,0 +1,30 @@
+package app.insa.clav.UISubStages;
+
+import app.insa.clav.Core.Model;
+import app.insa.clav.Reseau.TCPChatConnection;
+import app.insa.clav.UIControllers.ChatWindowController;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
+import java.io.IOException;
+
+public class ChatStage extends Stage {
+
+    public ChatStage(TCPChatConnection tcpCo){
+        FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("/fxml/chatWindow.fxml"));
+        try {
+            Parent rootChat = fxmlLoader.load();
+            ChatWindowController ctrl = fxmlLoader.getController();
+            ctrl.setTCPCo(tcpCo);
+            this.setTitle("Chat Room");
+            this.setScene(new Scene(rootChat, 500, 400));
+            this.setMinHeight(400);
+            this.setMinWidth(500);
+            this.show();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}

src/main/java/app/insa/clav/UISubStages/PseudoStage.java

@@ -14,7 +14,7 @@ import java.io.IOException;
  */
 public class PseudoStage extends Stage {
 
-    public PseudoStage(Model model){
+    public PseudoStage(){
         FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("/fxml/pseudoWindow.fxml"));
         try {
             Parent rootPseudo = fxmlLoader.load();

src/main/resources/fxml/chatWindow.fxml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import com.jfoenix.controls.JFXButton?>
+<?import javafx.scene.control.ListView?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import org.kordamp.ikonli.javafx.FontIcon?>
+
+<AnchorPane fx:id="rootAnchor" prefHeight="400.0" prefWidth="500.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="app.insa.clav.UIControllers.ChatWindowController">
+   <children>
+      <ListView fx:id="messageList" layoutX="20.0" layoutY="22.0" prefHeight="287.0" prefWidth="448.0" />
+      <TextField fx:id="messageInput" layoutX="31.0" layoutY="334.0" prefHeight="26.0" prefWidth="293.0" promptText="Message..." />
+      <JFXButton onAction="#buttonSendMessageClicked" fx:id="sendButton" buttonType="RAISED" layoutX="373.0" layoutY="334.0" ripplerFill="#36b90e" style="-fx-background-color: fc8c03;" text="Send">
+         <graphic>
+            <FontIcon iconLiteral="fa-send" wrappingWidth="16.0" />
+         </graphic>
+      </JFXButton>
+   </children>
+</AnchorPane>

src/main/resources/fxml/mainWindow.fxml

@@ -3,7 +3,9 @@
 <?import com.jfoenix.controls.JFXDrawer?>
 <?import com.jfoenix.controls.JFXHamburger?>
 <?import com.jfoenix.controls.JFXListView?>
+<?import javafx.scene.control.ContextMenu?>
 <?import javafx.scene.control.Label?>
+<?import javafx.scene.control.MenuItem?>
 <?import javafx.scene.effect.Shadow?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.text.Font?>
@@ -15,7 +17,14 @@
             <Shadow color="#b103ff" height="0.0" radius="0.0" width="0.0" />
          </effect></JFXHamburger>
       <JFXDrawer fx:id="mainDrawer" defaultDrawerSize="120.0" direction="RIGHT" layoutX="460.0" prefHeight="400.0" prefWidth="150.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="460.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
-      <JFXListView fx:id="userListView" depth="10" layoutX="40.0" layoutY="96.0" prefHeight="304.0" prefWidth="200.0" style="-fx-background-color: a1c3f7;" verticalGap="1.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="40.0" AnchorPane.rightAnchor="360.0" AnchorPane.topAnchor="96.0" />
+      <JFXListView fx:id="userListView" depth="10" layoutX="40.0" layoutY="96.0" prefHeight="304.0" prefWidth="200.0" style="-fx-background-color: a1c3f7;" verticalGap="1.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="40.0" AnchorPane.rightAnchor="360.0" AnchorPane.topAnchor="96.0">
+         <contextMenu>
+            <ContextMenu>
+              <items>
+                <MenuItem fx:id="openChatButton" mnemonicParsing="false" onAction="#openChat" text="Open Chat" />
+              </items>
+            </ContextMenu>
+         </contextMenu></JFXListView>
       <Label fx:id="mainLabel" layoutX="74.0" layoutY="16.0" prefHeight="30.0" prefWidth="302.0" style="-fx-font-weight: bold;" text="Welcome, please choose a pseudo" textAlignment="CENTER" textFill="#ed0e7f" wrapText="true">
          <font>
             <Font name="Ubuntu" size="17.0" />