Corrections bugs suite au merge

Implementation/.classpath

@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path=""/>
-<<<<<<< HEAD
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-=======
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-13">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="jgoodies-forms-1.8.0.jar" sourcepath="jgoodies-forms-1.8.0-sources.jar"/>
->>>>>>> View
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Implementation/src/Controller/ChatApp.java

@@ -1,3 +1,5 @@
+package src.Controller;
+
 import java.io.IOException;
 import java.net.DatagramSocket;
 import java.net.InetAddress;
@@ -13,6 +15,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import src.Protocoles.*;
 
 /**
 * <p>
@@ -235,28 +238,3 @@ public class ChatApp {
 
 }
 
-class RunnerEcouteUDP implements Runnable {
-    ChatApp app ;
-    public RunnerEcouteUDP(ChatApp app) {
-        this.app = app ;
-    }
-    @Override
-    public void run() {
-
-    	UDPEchange.ecouteUDP(app);
-
-    }
-}
-
-class RunnerEcouteTCP implements Runnable {
-    ChatApp app ;
-    public RunnerEcouteTCP(ChatApp app) {
-        this.app = app ;
-    }
-    @Override
-    public void run() {
-
-    	TCPEchange.ecouteTCP(app);
-
-    }
-}

Implementation/src/Controller/Historique.java

@@ -1,3 +1,5 @@
+package src.Controller;
+
 import java.util.ArrayList;
 
 /**

Implementation/src/Controller/ListUtilisateurs.java

@@ -1,3 +1,5 @@
+package src.Controller;
+
 import java.util.ArrayList;
 
 public class ListUtilisateurs {

Implementation/src/Controller/MessageHorodate.java

@@ -1,3 +1,5 @@
+package src.Controller;
+
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

Implementation/src/Controller/Modification_Pseudo.java

@@ -1,3 +1,5 @@
+package src.Controller;
+
 import java.awt.BorderLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

Implementation/src/Controller/Utilisateur.java

@@ -1,3 +1,5 @@
+package src.Controller;
+
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 

Implementation/src/Protocoles/RunnerEcouteTCP.java

@@ -0,0 +1,16 @@
+package src.Protocoles;
+
+import src.Controller.ChatApp;
+
+public class RunnerEcouteTCP implements Runnable {
+    ChatApp app ;
+    public RunnerEcouteTCP(ChatApp app) {
+        this.app = app ;
+    }
+    @Override
+    public void run() {
+
+    	TCPEchange.ecouteTCP(app);
+
+    }
+}

Implementation/src/Protocoles/RunnerEcouteUDP.java

@@ -0,0 +1,16 @@
+package src.Protocoles;
+
+import src.Controller.ChatApp;
+
+public class RunnerEcouteUDP implements Runnable {
+    ChatApp app ;
+    public RunnerEcouteUDP(ChatApp app) {
+        this.app = app ;
+    }
+    @Override
+    public void run() {
+
+    	UDPEchange.ecouteUDP(app);
+
+    }
+}

Implementation/src/Protocoles/TCPEchange.java

@@ -1,3 +1,5 @@
+package src.Protocoles;
+
 import java.io.InputStream;
 import java.io.PrintStream;
 import java.io.PrintWriter;
@@ -10,6 +12,9 @@ import java.util.NoSuchElementException;
 import java.util.Scanner;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+
+import src.Controller.*;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;

Implementation/src/Protocoles/UDPEchange.java

@@ -1,3 +1,5 @@
+package src.Protocoles;
+
 import java.io.IOException;
 
 import java.net.DatagramPacket;
@@ -12,6 +14,8 @@ import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+
+import src.Controller.*;
 /**
 * <p>
 * Classe representant les echanges UDP entre utilisateurs.

Implementation/src/View/View_Accueil.java

@@ -1,3 +1,5 @@
+package src.View;
+
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.GridLayout;
@@ -18,6 +20,10 @@ import javax.swing.JPanel;
 import javax.swing.JTextField;
 import javax.swing.SwingConstants;
 
+import src.Controller.*;
+import src.Protocoles.*;
+
+
 /*
  * Classe represenyant la fenetre d'accueil pour la connexion d'un utilisateur.
  */

Implementation/src/View/View_Clavardage.java

@@ -1,3 +1,5 @@
+package src.View;
+
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.GridLayout;
@@ -15,9 +17,9 @@ import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
 import javax.swing.SwingConstants;
-import com.jgoodies.forms.layout.FormLayout;
+
-import com.jgoodies.forms.layout.ColumnSpec;
+import src.Controller.*;
-import com.jgoodies.forms.layout.RowSpec;
+
 import java.awt.GridBagLayout;
 import java.awt.Font;
 import java.awt.Color;

Implementation/src/View/View_Menu.java

@@ -1,3 +1,5 @@
+package src.View;
+
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.GridLayout;
@@ -32,6 +34,7 @@ import javax.swing.JTextArea;
 import javax.swing.JTextField;
 import javax.swing.SwingConstants;
 
+import src.Controller.*;
 
 import java.awt.Font;
 import java.awt.Color;