Added image display

.idea/dataSources.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
+    <data-source source="LOCAL" name="@localhost" uuid="f82aebd1-fd1a-4e96-9405-381c0ad20dcf">
+      <driver-ref>mysql.8</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
+      <jdbc-url>jdbc:mysql://localhost:3306</jdbc-url>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
+  </component>
+</project>

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

@@ -14,7 +14,8 @@ public class MessageDisplay {
     private String payload;
     /**
      * Type 1 --> Normal text message
-     * Type 2 --> File message
+     * Type 2 --> File message not image
+     * Type 3 --> Image file (png, jpg, gif, jpeg, svg)
      */
     private int type;
 

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

@@ -5,10 +5,13 @@ import java.io.File;
 public class MessageDisplayFile extends MessageDisplay{
 
     private File file;
+    private String ext;
 
-    public MessageDisplayFile(int sourceId, String date, String payload, int type, File file) {
+
+    public MessageDisplayFile(int sourceId, String date, String payload, int type, File file, String ext) {
         super(sourceId, date, payload, type);
         this.file = file;
+        this.ext = ext;
     }
 
     public MessageDisplayFile(File file) {
@@ -22,4 +25,12 @@ public class MessageDisplayFile extends MessageDisplay{
     public void setFile(File file) {
         this.file = file;
     }
+
+    public String getExt() {
+        return ext;
+    }
+
+    public void setExt(String ext) {
+        this.ext = ext;
+    }
 }

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

@@ -142,7 +142,17 @@ public class TCPChatConnection extends Thread{
                         size -= bytes;
                     }
                     System.out.println("Reception fichier terminée");
-                    this.msgReceivedBufferFiles.add(new MessageDisplayFile(this.remoteUserId,msgFile.date,msgFile.payload,2,file));
+                    int type = 2;
+                    switch (msgFile.ext) {
+                        case "png":
+                        case "gif":
+                        case "jpeg":
+                        case "svg":
+                        case "jpg":
+                            type = 3;
+                            break;
+                    }
+                    this.msgReceivedBufferFiles.add(new MessageDisplayFile(this.remoteUserId,msgFile.date,msgFile.payload,type,file,msgFile.ext));
                     this.support.firePropertyChange("fileReceived",true,false);
                     fileOutputStream.close();
                 } catch (IOException e) {
@@ -168,8 +178,7 @@ public class TCPChatConnection extends Thread{
 
     public void sendMessageFile(MessageDisplayFile msgDisp){
         int bytes = 0;
-        String ext = FilenameUtils.getExtension(msgDisp.getFile().getPath());
-        MessageChatFile msgStartofFile = new MessageChatFile(9,this.link.getLocalAddress(),this.link.getLocalPort(),this.link.getInetAddress(),this.link.getPort(),msgDisp.getPayload(),msgDisp.getDate(),msgDisp.getFile().length(),ext);
+        MessageChatFile msgStartofFile = new MessageChatFile(9,this.link.getLocalAddress(),this.link.getLocalPort(),this.link.getInetAddress(),this.link.getPort(),msgDisp.getPayload(),msgDisp.getDate(),msgDisp.getFile().length(),msgDisp.getExt());
         try {
             this.objectOutStream.writeObject(msgStartofFile);
         } catch (IOException e) {

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

@@ -30,6 +30,7 @@ import javafx.scene.text.TextAlignment;
 import javafx.stage.FileChooser;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
+import org.apache.commons.io.FilenameUtils;
 
 import javax.swing.*;
 import java.awt.*;
@@ -37,6 +38,7 @@ import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.File;
 import java.io.IOException;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -153,9 +155,9 @@ public class ChatWindowController implements Initializable, PropertyChangeListen
                                 //Desktop.getDesktop().browseFileDirectory(msgFile.getFile());
                             }
                         });
+                        HBox hbox = new HBox();
+                        hbox.setSpacing(2.0);
                         if (item.getSourceId() == remoteUser.getId()) {
-                            HBox hbox = new HBox();
-                            hbox.setSpacing(2.0);
                             hbox.setAlignment(Pos.CENTER_RIGHT);
                             hbox.setBackground(new Background(new BackgroundFill(Paint.valueOf(Color.TRANSPARENT.toString()), null, null)));
                             setBackground(new Background(new BackgroundFill(Paint.valueOf(Color.AZURE.toString()), null, null)));
@@ -168,8 +170,7 @@ public class ChatWindowController implements Initializable, PropertyChangeListen
                             setTextAlignment(TextAlignment.RIGHT);
                             setPadding(new Insets(10, 0, 10, param.getWidth() * 0.3));
                         } else {
-                            HBox hbox = new HBox();
-                            hbox.setSpacing(2.0);
+                            hbox.setAlignment(Pos.CENTER_LEFT);
                             hbox.setBackground(new Background(new BackgroundFill(Paint.valueOf(Color.TRANSPARENT.toString()), null, null)));
                             setBackground(new Background(new BackgroundFill(Paint.valueOf(Color.CORNSILK.toString()), null, null)));
                             ImageView img = new ImageView();
@@ -181,6 +182,45 @@ public class ChatWindowController implements Initializable, PropertyChangeListen
                             setTextAlignment(TextAlignment.LEFT);
                             setPadding(new Insets(10, param.getWidth() * 0.3, 10, 0));
                         }
+                    } else if (item.getType() == 3){
+                        MessageDisplayFile msgFile = (MessageDisplayFile) item;
+                        Image imageFileSource = null;
+                        try {
+                            imageFileSource = new Image(msgFile.getFile().toURI().toURL().toExternalForm());
+                        } catch (MalformedURLException e) {
+                            e.printStackTrace();
+                        }
+                        ImageView imageFileView = new ImageView();
+                        imageFileView.setImage(imageFileSource);
+                        HBox hbox = new HBox();
+                        hbox.setSpacing(2.0);
+                        imageFileView.setPreserveRatio(true);
+                        imageFileView.fitWidthProperty().bind(this.widthProperty());
+                        if (item.getSourceId() == remoteUser.getId()) {
+                            hbox.setAlignment(Pos.CENTER_RIGHT);
+                            hbox.setBackground(new Background(new BackgroundFill(Paint.valueOf(Color.TRANSPARENT.toString()), null, null)));
+                            setBackground(new Background(new BackgroundFill(Paint.valueOf(Color.AZURE.toString()), null, null)));
+                            ImageView img = new ImageView();
+                            img.setImage(imageRemote);
+                            hbox.getChildren().addAll(imageFileView, img);
+                            setGraphic(hbox);
+                            setContentDisplay(ContentDisplay.RIGHT);
+                            setAlignment(Pos.CENTER_RIGHT);
+                            setTextAlignment(TextAlignment.RIGHT);
+                            setPadding(new Insets(10, 0, 10, param.getWidth() * 0.3));
+                        } else {
+                            hbox.setAlignment(Pos.CENTER_LEFT);
+                            hbox.setBackground(new Background(new BackgroundFill(Paint.valueOf(Color.TRANSPARENT.toString()), null, null)));
+                            setBackground(new Background(new BackgroundFill(Paint.valueOf(Color.CORNSILK.toString()), null, null)));
+                            ImageView img = new ImageView();
+                            img.setImage(imageSource);
+                            hbox.getChildren().addAll(img, imageFileView);
+                            setGraphic(hbox);
+                            setContentDisplay(ContentDisplay.LEFT);
+                            setAlignment(Pos.CENTER_LEFT);
+                            setTextAlignment(TextAlignment.LEFT);
+                            setPadding(new Insets(10, param.getWidth() * 0.3, 10, 0));
+                        }
                     }
                 }
             }
@@ -279,7 +319,18 @@ public class ChatWindowController implements Initializable, PropertyChangeListen
 
         //We send the File if the filed is not null
         if (this.filePicked != null){
-            MessageDisplayFile msgFile = new MessageDisplayFile(model.user.getId(),timeStamp,this.filePicked.getName(),2,this.filePicked);
+            String ext = FilenameUtils.getExtension(this.filePicked.getPath());
+            int type = 2;
+            switch (ext) {
+                case "png":
+                case "gif":
+                case "jpeg":
+                case "svg":
+                case "jpg":
+                    type = 3;
+                    break;
+            }
+            MessageDisplayFile msgFile = new MessageDisplayFile(model.user.getId(),timeStamp,this.filePicked.getName(),type,this.filePicked, ext);
             this.listMessages.add(msgFile);
             this.tcpCo.sendMessageFile(msgFile);
             this.filePicked = null;