From 9e78fabd30e6a065d2a0243e5a04dbe65aa213f4 Mon Sep 17 00:00:00 2001
From: alartigu <alartigu@etud.insa-toulouse.fr>
Date: Mon, 28 Dec 2020 11:46:40 +0400
Subject: [PATCH] AJout Date lors de l'affichage

---
 .../build/tmp/compileJava/source-classes-mapping.txt | 12 ++++++------
 .../chatapp/src/main/java/chatapp/Launcher.java      |  8 +-------
 .../src/main/java/chatapp/View/Clavardage.java       |  6 +++++-
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt b/Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt
index 5e75d5f..927369d 100644
--- a/Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt
+++ b/Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt
@@ -1,3 +1,7 @@
+chatapp/View/ConnexionScreen.java
+ chatapp.View.ConnexionScreen
+chatapp/View/DemarrerSession.java
+ chatapp.View.DemarrerSession
 chatapp/Protocol/RunnerEcouteTCP.java
  chatapp.Protocol.RunnerEcouteTCP
 chatapp/View/FenetreSession.java
@@ -11,8 +15,6 @@ chatapp/View/ChangementPseudo.java
  chatapp.View.ChangementPseudo
 chatapp/Protocol/RunnerEcouteUDP.java
  chatapp.Protocol.RunnerEcouteUDP
-chatapp/Launcher.java
- chatapp.Launcher
 chatapp/Model/ListUtilisateurs.java
  chatapp.Model.ListUtilisateurs
 chatapp/Protocol/UDPEchange.java
@@ -27,13 +29,11 @@ chatapp/View/Clavardage.java
  chatapp.View.Clavardage$1
 chatapp/Protocol/SessionClavardage.java
  chatapp.Protocol.SessionClavardage
-chatapp/View/ConnexionScreen.java
- chatapp.View.ConnexionScreen
 chatapp/View/View_Utilisateurs.java
  chatapp.View.View_Utilisateurs
 chatapp/Model/Utilisateur.java
  chatapp.Model.Utilisateur
 chatapp/View/View_Menu.java
  chatapp.View.View_Menu
-chatapp/View/DemarrerSession.java
- chatapp.View.DemarrerSession
+chatapp/Launcher.java
+ chatapp.Launcher
diff --git a/Implementation/chatapp/src/main/java/chatapp/Launcher.java b/Implementation/chatapp/src/main/java/chatapp/Launcher.java
index 32eaad1..c464364 100644
--- a/Implementation/chatapp/src/main/java/chatapp/Launcher.java
+++ b/Implementation/chatapp/src/main/java/chatapp/Launcher.java
@@ -1,13 +1,7 @@
 package chatapp;
 
-import com.sun.tools.javac.Main;
-
 public class Launcher {
     public static void main(String[] args) {
-        try {
-            Main.main(args);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        Main.main(args);
     }
 }
diff --git a/Implementation/chatapp/src/main/java/chatapp/View/Clavardage.java b/Implementation/chatapp/src/main/java/chatapp/View/Clavardage.java
index 9facb7f..91e9f1f 100644
--- a/Implementation/chatapp/src/main/java/chatapp/View/Clavardage.java
+++ b/Implementation/chatapp/src/main/java/chatapp/View/Clavardage.java
@@ -4,6 +4,7 @@ package chatapp.View;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.net.URL;
+import java.util.Date;
 import java.util.ResourceBundle;
 
 import chatapp.Controller.ChatApp;
@@ -52,7 +53,8 @@ public class Clavardage implements Initializable, PropertyChangeListener {
         AEnvoyer.clear();
         if(!msg.equals("")) {
             session.envoiMsg(msg);
-            msg = "Moi: " + msg + "\n";
+            Date d = new Date();
+            msg = "Moi (" + d.toString() + ") : " + msg + "\n";
             ChatText.appendText(msg);
         }
     }
@@ -76,7 +78,9 @@ public class Clavardage implements Initializable, PropertyChangeListener {
         switch (evt.getPropertyName()){
             case "MessageRecu" :
                 MessageHorodate msgh = session.getDernierMsg();
+                Date d = new Date();
                 String msg = u2.getPseudo();
+                msg += " ("+ d.toString() +") ";
                 msg+=": "+msgh.getMessage();
                 ChatText.appendText(msg);
                 break;