diff --git a/Implementation/.classpath b/Implementation/.classpath index 9b5db30..e6f7288 100644 --- a/Implementation/.classpath +++ b/Implementation/.classpath @@ -1,15 +1,10 @@ - -<<<<<<< HEAD - -======= - + + - ->>>>>>> View diff --git a/Implementation/src/ChatApp.class b/Implementation/src/ChatApp.class deleted file mode 100644 index ecac7fc..0000000 Binary files a/Implementation/src/ChatApp.class and /dev/null differ diff --git a/Implementation/src/ChatApp.java b/Implementation/src/Controller/ChatApp.java similarity index 94% rename from Implementation/src/ChatApp.java rename to Implementation/src/Controller/ChatApp.java index fa4e60e..ff0cabe 100644 --- a/Implementation/src/ChatApp.java +++ b/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.*; /** *

@@ -31,8 +34,8 @@ public class ChatApp { /* ChatApp est associe a un utilisateur */ private Utilisateur me; - - /** + + /** * Constructeur de l'application de chat * * @param pseudo Pseudo de l'utilisateur @@ -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); - - } -} diff --git a/Implementation/src/Historique.java b/Implementation/src/Controller/Historique.java similarity index 98% rename from Implementation/src/Historique.java rename to Implementation/src/Controller/Historique.java index 7e35e2f..270502a 100644 --- a/Implementation/src/Historique.java +++ b/Implementation/src/Controller/Historique.java @@ -1,3 +1,5 @@ +package src.Controller; + import java.util.ArrayList; /** diff --git a/Implementation/src/ListUtilisateurs.java b/Implementation/src/Controller/ListUtilisateurs.java similarity index 99% rename from Implementation/src/ListUtilisateurs.java rename to Implementation/src/Controller/ListUtilisateurs.java index bdd8efa..edaa31a 100644 --- a/Implementation/src/ListUtilisateurs.java +++ b/Implementation/src/Controller/ListUtilisateurs.java @@ -1,3 +1,5 @@ +package src.Controller; + import java.util.ArrayList; public class ListUtilisateurs { diff --git a/Implementation/src/MessageHorodate.java b/Implementation/src/Controller/MessageHorodate.java similarity index 99% rename from Implementation/src/MessageHorodate.java rename to Implementation/src/Controller/MessageHorodate.java index 7aeb573..1d86472 100644 --- a/Implementation/src/MessageHorodate.java +++ b/Implementation/src/Controller/MessageHorodate.java @@ -1,3 +1,5 @@ +package src.Controller; + import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/Implementation/src/Modification_Pseudo.java b/Implementation/src/Controller/Modification_Pseudo.java similarity index 98% rename from Implementation/src/Modification_Pseudo.java rename to Implementation/src/Controller/Modification_Pseudo.java index 0ebc13e..e34b110 100644 --- a/Implementation/src/Modification_Pseudo.java +++ b/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; diff --git a/Implementation/src/Utilisateur.java b/Implementation/src/Controller/Utilisateur.java similarity index 98% rename from Implementation/src/Utilisateur.java rename to Implementation/src/Controller/Utilisateur.java index 37a4c26..9a35547 100644 --- a/Implementation/src/Utilisateur.java +++ b/Implementation/src/Controller/Utilisateur.java @@ -1,3 +1,5 @@ +package src.Controller; + import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/Implementation/src/Historique.class b/Implementation/src/Historique.class deleted file mode 100644 index 52ce906..0000000 Binary files a/Implementation/src/Historique.class and /dev/null differ diff --git a/Implementation/src/ListUtilisateurs.class b/Implementation/src/ListUtilisateurs.class deleted file mode 100644 index e6a1cf6..0000000 Binary files a/Implementation/src/ListUtilisateurs.class and /dev/null differ diff --git a/Implementation/src/MessageHorodate.class b/Implementation/src/MessageHorodate.class deleted file mode 100644 index 8239524..0000000 Binary files a/Implementation/src/MessageHorodate.class and /dev/null differ diff --git a/Implementation/src/Protocoles/RunnerEcouteTCP.java b/Implementation/src/Protocoles/RunnerEcouteTCP.java new file mode 100644 index 0000000..2706ea4 --- /dev/null +++ b/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); + + } +} \ No newline at end of file diff --git a/Implementation/src/Protocoles/RunnerEcouteUDP.java b/Implementation/src/Protocoles/RunnerEcouteUDP.java new file mode 100644 index 0000000..7810123 --- /dev/null +++ b/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); + + } +} \ No newline at end of file diff --git a/Implementation/src/TCPEchange.java b/Implementation/src/Protocoles/TCPEchange.java similarity index 99% rename from Implementation/src/TCPEchange.java rename to Implementation/src/Protocoles/TCPEchange.java index c7df02b..77c8be5 100644 --- a/Implementation/src/TCPEchange.java +++ b/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; diff --git a/Implementation/src/UDPEchange.java b/Implementation/src/Protocoles/UDPEchange.java similarity index 99% rename from Implementation/src/UDPEchange.java rename to Implementation/src/Protocoles/UDPEchange.java index ab158df..4652a0d 100644 --- a/Implementation/src/UDPEchange.java +++ b/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.*; /** *

* Classe representant les echanges UDP entre utilisateurs. diff --git a/Implementation/src/Runner.class b/Implementation/src/Runner.class deleted file mode 100644 index 27df8ff..0000000 Binary files a/Implementation/src/Runner.class and /dev/null differ diff --git a/Implementation/src/RunnerEcouteTCP.class b/Implementation/src/RunnerEcouteTCP.class deleted file mode 100644 index df8fec6..0000000 Binary files a/Implementation/src/RunnerEcouteTCP.class and /dev/null differ diff --git a/Implementation/src/RunnerEcouteUDP.class b/Implementation/src/RunnerEcouteUDP.class deleted file mode 100644 index 7cf0325..0000000 Binary files a/Implementation/src/RunnerEcouteUDP.class and /dev/null differ diff --git a/Implementation/src/RunnerTCPEcoute.class b/Implementation/src/RunnerTCPEcoute.class deleted file mode 100644 index a029f97..0000000 Binary files a/Implementation/src/RunnerTCPEcoute.class and /dev/null differ diff --git a/Implementation/src/RunnerTCPEnvoi.class b/Implementation/src/RunnerTCPEnvoi.class deleted file mode 100644 index a2267ef..0000000 Binary files a/Implementation/src/RunnerTCPEnvoi.class and /dev/null differ diff --git a/Implementation/src/RunnerUDP.class b/Implementation/src/RunnerUDP.class deleted file mode 100644 index 7b65e74..0000000 Binary files a/Implementation/src/RunnerUDP.class and /dev/null differ diff --git a/Implementation/src/TCPEchange.class b/Implementation/src/TCPEchange.class deleted file mode 100644 index 755f7d9..0000000 Binary files a/Implementation/src/TCPEchange.class and /dev/null differ diff --git a/Implementation/src/UDPEchange.class b/Implementation/src/UDPEchange.class deleted file mode 100644 index 93bf17d..0000000 Binary files a/Implementation/src/UDPEchange.class and /dev/null differ diff --git a/Implementation/src/Utilisateur.class b/Implementation/src/Utilisateur.class deleted file mode 100644 index 3f58c14..0000000 Binary files a/Implementation/src/Utilisateur.class and /dev/null differ diff --git a/Implementation/src/View_Accueil.java b/Implementation/src/View/View_Accueil.java similarity index 98% rename from Implementation/src/View_Accueil.java rename to Implementation/src/View/View_Accueil.java index eb921ae..3f349cb 100644 --- a/Implementation/src/View_Accueil.java +++ b/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. */ diff --git a/Implementation/src/View_Clavardage.java b/Implementation/src/View/View_Clavardage.java similarity index 97% rename from Implementation/src/View_Clavardage.java rename to Implementation/src/View/View_Clavardage.java index da81a6d..767ec92 100644 --- a/Implementation/src/View_Clavardage.java +++ b/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 com.jgoodies.forms.layout.RowSpec; + +import src.Controller.*; + import java.awt.GridBagLayout; import java.awt.Font; import java.awt.Color; diff --git a/Implementation/src/View_Menu.java b/Implementation/src/View/View_Menu.java similarity index 99% rename from Implementation/src/View_Menu.java rename to Implementation/src/View/View_Menu.java index c946d76..3ffea35 100644 --- a/Implementation/src/View_Menu.java +++ b/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; diff --git a/Implementation/jgoodies-forms-1.8.0-sources.jar b/Implementation/src/View/jgoodies-forms-1.8.0-sources.jar similarity index 100% rename from Implementation/jgoodies-forms-1.8.0-sources.jar rename to Implementation/src/View/jgoodies-forms-1.8.0-sources.jar diff --git a/Implementation/jgoodies-forms-1.8.0.jar b/Implementation/src/View/jgoodies-forms-1.8.0.jar similarity index 100% rename from Implementation/jgoodies-forms-1.8.0.jar rename to Implementation/src/View/jgoodies-forms-1.8.0.jar