diff --git a/Projet_POO/src/defaut/Main.java b/Projet_POO/src/defaut/Main.java index 3a98c90..5ba80ab 100644 --- a/Projet_POO/src/defaut/Main.java +++ b/Projet_POO/src/defaut/Main.java @@ -8,13 +8,18 @@ import ui.Login_RegisterUI; public class Main { public static void main(String[] args) { - + //on lance le server d'écoute de cmd GestionnaireListeUtilisateur.instance().ecoute(); + + //on crée manuellement des utilisateurs GestionnaireListeUtilisateur.instance().envoie("add$$$77$$$Moi$$$LocalHost"); + + //on met à jour notre liste GestionnaireListeUtilisateur.instance().majListe(); - Thread t = new Thread(new Login_RegisterUI());//gestionnaireListeUtilisateur, gestionnaireNom)); + //on lance le UI + Thread t = new Thread(new Login_RegisterUI()); t.start(); } diff --git a/Projet_POO/src/liste/ClientB.java b/Projet_POO/src/liste/ClientB.java index 61d4583..cc20de4 100644 --- a/Projet_POO/src/liste/ClientB.java +++ b/Projet_POO/src/liste/ClientB.java @@ -1,14 +1,13 @@ package liste; - -//import nom.*; +// CECI NE SERT QU AU DEBUG public class ClientB { GestionnaireListeUtilisateur gestionnaireListeUtilisateur = GestionnaireListeUtilisateur.instance(); //usefull ? puisque static ? - String nom = "Delta"; - String id = "0"; + //String nom = "Delta"; + //String id = "0"; void test(String msg) { //GestionnaireNom.setNom(nom); diff --git a/Projet_POO/src/liste/GestionnaireListeUtilisateur.java b/Projet_POO/src/liste/GestionnaireListeUtilisateur.java index 8fff3f8..7679bfa 100644 --- a/Projet_POO/src/liste/GestionnaireListeUtilisateur.java +++ b/Projet_POO/src/liste/GestionnaireListeUtilisateur.java @@ -10,7 +10,6 @@ public class GestionnaireListeUtilisateur { private ArrayList listeUtilisateur = new ArrayList(); - //Instance du gestionnaire de liste static private GestionnaireListeUtilisateur uniqueInstance = null; @@ -27,14 +26,14 @@ public class GestionnaireListeUtilisateur { } - + //Renvoie la ListeUtilisateur public ArrayList getListeUtilisateur() { return listeUtilisateur; } - + // Set la listeUtilisateur public void setListeUtilisateur(ArrayList liste) { listeUtilisateur = liste; @@ -42,7 +41,7 @@ public class GestionnaireListeUtilisateur { - //récupérer la liste des autres + //Demande à tout le monde d'envoyer leur infos (TypeListeUtilisateur) --> Uniquement lors de la connexion public void majListe() { UdpBroadcastClient client = new UdpBroadcastClient(ConstanteListeUtilisateur.NUM_PORT_SERVER, "listRequest"+ "$$$" + " " + "$$$" + " " + "$$$" + " "); @@ -54,7 +53,7 @@ public class GestionnaireListeUtilisateur { //ecoute le port de broadcast pour recevoir le message personnalisé public void ecoute() { //static ?? - Thread ecouteThread = new Thread(new UdpUnicastServer(ConstanteListeUtilisateur.NUM_PORT_SERVER)); + Thread ecouteThread = new Thread(new UdpBroadcastServer(ConstanteListeUtilisateur.NUM_PORT_SERVER)); ecouteThread.start(); } diff --git a/Projet_POO/src/liste/MainB.java b/Projet_POO/src/liste/MainB.java index 0f3c0c3..de25d2b 100644 --- a/Projet_POO/src/liste/MainB.java +++ b/Projet_POO/src/liste/MainB.java @@ -1,7 +1,6 @@ package liste; -//import java.util.concurrent.ExecutorService; -//import java.util.concurrent.Executors; +// CECI NE SERT QU AU DEBUG public class MainB { @@ -10,14 +9,14 @@ public class MainB { UdpBroadcastServer server = new UdpBroadcastServer(portServer); ClientB client0 = new ClientB(); - //ClientB client1 = new ClientB(); - //ClientB client2 = new ClientB(); + ClientB client1 = new ClientB(); + ClientB client2 = new ClientB(); Thread ts = new Thread(server); ts.start(); client0.test("add$$$" + 77 + "$$$Delta$$$LocalHost"); - //client1.test("add$$$" + 75 + "$$$Beta$$$LocalHost"); - //client2.test("add$$$" + 11 + "$$$Alpha$$$LocalHost"); + client1.test("add$$$" + 75 + "$$$Beta$$$LocalHost"); + client2.test("add$$$" + 11 + "$$$Alpha$$$LocalHost"); } } diff --git a/Projet_POO/src/liste/MainUDPBroad.java b/Projet_POO/src/liste/MainUDPBroad.java deleted file mode 100644 index 467a4cf..0000000 --- a/Projet_POO/src/liste/MainUDPBroad.java +++ /dev/null @@ -1,30 +0,0 @@ -package liste; - -//import java.util.concurrent.ExecutorService; -//import java.util.concurrent.Executors; - -public class MainUDPBroad { - - public static void main(String[] args) { - int portServer = ConstanteListeUtilisateur.NUM_PORT_SERVER; - - UdpBroadcastServer server = new UdpBroadcastServer(portServer); - UdpBroadcastClient client = new UdpBroadcastClient(portServer, "add$$$" + 77 + "$$$Delta$$$LocalHost"); - UdpBroadcastClient client1 = new UdpBroadcastClient(portServer, "add$$$" + 75 + "$$$Beta$$$LocalHost"); - UdpBroadcastClient client2 = new UdpBroadcastClient(portServer, "add$$$" + 11 + "$$$Alpha$$$LocalHost"); - - Thread ts = new Thread(server); - Thread t0 = new Thread(client); - Thread t1 = new Thread(client1); - Thread t2 = new Thread(client2); - - ts.start(); - t0.start(); - t1.start(); - t2.start(); - - //ExecutorService executorService = Executors.newFixedThreadPool(2); - //executorService.submit(server); - //executorService.submit(client); - } -} diff --git a/Projet_POO/src/liste/MainUDPMulti.java b/Projet_POO/src/liste/MainUDPMulti.java deleted file mode 100644 index 0048dc2..0000000 --- a/Projet_POO/src/liste/MainUDPMulti.java +++ /dev/null @@ -1,26 +0,0 @@ -package liste; - -//import java.util.concurrent.ExecutorService; -//import java.util.concurrent.Executors; - -public class MainUDPMulti { - - public static void main(String[] args) { //ne marche pas : soit route (routeur) soit code soit 2 .... - int portServer = 2000; - int multicastPort = 7000; - - UdpMulticastServer server = new UdpMulticastServer(portServer, multicastPort); - UdpMulticastClient client = new UdpMulticastClient(portServer, multicastPort); - - Thread ts = new Thread(server); - Thread t0 = new Thread(client); - - - ts.start(); - t0.start(); - - //ExecutorService executorService = Executors.newFixedThreadPool(2); - //executorService.submit(server); - //executorService.submit(client); - } -} diff --git a/Projet_POO/src/liste/MainUDPUni.java b/Projet_POO/src/liste/MainUDPUni.java deleted file mode 100644 index adc4c92..0000000 --- a/Projet_POO/src/liste/MainUDPUni.java +++ /dev/null @@ -1,31 +0,0 @@ -package liste; - -//import java.util.concurrent.ExecutorService; -//import java.util.concurrent.Executors; - -public class MainUDPUni { - - public static void main(String[] args) { - int portServer = 2000; - - - UdpUnicastServer server = new UdpUnicastServer(portServer); - UdpUnicastClient client = new UdpUnicastClient(portServer, "LocalHost"); - UdpUnicastClient client1 = new UdpUnicastClient(portServer, "LocalHost"); - UdpUnicastClient client2 = new UdpUnicastClient(portServer, "LocalHost"); - - Thread ts = new Thread(server); - Thread t0 = new Thread(client); - Thread t1 = new Thread(client1); - Thread t2 = new Thread(client2); - - ts.start(); - t0.start(); - t1.start(); - t2.start(); - - //ExecutorService executorService = Executors.newFixedThreadPool(2); - //executorService.submit(server); - //executorService.submit(client); - } -} diff --git a/Projet_POO/src/liste/UdpMulticastClient.java b/Projet_POO/src/liste/UdpMulticastClient.java deleted file mode 100644 index d6a6386..0000000 --- a/Projet_POO/src/liste/UdpMulticastClient.java +++ /dev/null @@ -1,52 +0,0 @@ -package liste; - -import java.net.InetAddress; -import java.net.SocketException; -import java.io.IOException; -import java.net.DatagramPacket; -import java.net.UnknownHostException; -import java.net.MulticastSocket; - -public class UdpMulticastClient implements Runnable{ - - private final int serverPort; - private final int multicastPort; - - public UdpMulticastClient(int serverPort, int multicastPort) { - this.serverPort = serverPort; - this.multicastPort = multicastPort; - } - - - public void run() { - try{ - Thread.sleep(1000); - - InetAddress groupe = InetAddress.getByName("230.0.0.1"); - MulticastSocket multicastSocket = new MulticastSocket(multicastPort); // port ? - String message = "add$$$" + 77 + "$$$Roger$$$LocalHost"; //ordre$$$id$$$nom$$$ip - DatagramPacket datagramPacket = new DatagramPacket( - message.getBytes(), - message.length(), - groupe, - serverPort - ); - System.out.println("ici"); - multicastSocket.send(datagramPacket); - System.out.println("ici"); - multicastSocket.close(); - - - } catch (SocketException e) { - e.printStackTrace(); - } catch (UnknownHostException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } catch (Exception e) {} - - - - } - -} diff --git a/Projet_POO/src/liste/UdpMulticastServer.java b/Projet_POO/src/liste/UdpMulticastServer.java deleted file mode 100644 index 8211525..0000000 --- a/Projet_POO/src/liste/UdpMulticastServer.java +++ /dev/null @@ -1,63 +0,0 @@ -package liste; - -import java.io.IOException; -import java.net.DatagramPacket; -import java.net.InetAddress; -import java.net.MulticastSocket; -import java.net.NetworkInterface; -import java.net.SocketException; -import java.util.concurrent.Semaphore; -import java.net.NetworkInterface; -import java.net.InetSocketAddress; - - -public class UdpMulticastServer implements Runnable{ - - private final int serverPort; - private final int multicastPort; - - public UdpMulticastServer(int serverPort, int multicastPort) { - this.serverPort = serverPort; - this.multicastPort = multicastPort; - } - - - public void run() { - try(MulticastSocket multicastSocket = new MulticastSocket(serverPort)){ - - InetAddress multicastAddr = InetAddress.getByName("229.0.0.1"); - InetSocketAddress groupe = new InetSocketAddress(multicastAddr, multicastPort); - NetworkInterface netIf = NetworkInterface.getByIndex(0); - - - multicastSocket.joinGroup(groupe, netIf); - - Semaphore semaphore = new Semaphore(1, true); - - byte[] buffer = new byte[65507]; - //serverSocket.setSoTimeout(3000); - while (true) { - DatagramPacket datagramPacket = new DatagramPacket(buffer, 0, buffer.length); - System.out.println("serverAttente"); - multicastSocket.receive(datagramPacket); - System.out.println("serverReçu"); - String receivedMessage = new String(datagramPacket.getData(), 0, datagramPacket.getLength()); - System.out.println(receivedMessage); - - Thread t = new Thread( new TraitementCmdListe(receivedMessage, semaphore) ); - t.start(); - - - } - - - } catch (SocketException e) { - e.printStackTrace(); - - } catch (IOException e) { - System.out.println("Timedout. CLient is closing."); - } - } - - -} diff --git a/Projet_POO/src/liste/UdpUnicastClient.java b/Projet_POO/src/liste/UdpUnicastClient.java deleted file mode 100644 index 60b1a2a..0000000 --- a/Projet_POO/src/liste/UdpUnicastClient.java +++ /dev/null @@ -1,47 +0,0 @@ -package liste; - -import java.net.DatagramSocket; -import java.net.InetAddress; -import java.net.SocketException; -import java.io.IOException; -import java.net.DatagramPacket; -import java.net.UnknownHostException; - -public class UdpUnicastClient implements Runnable{ - - private final int serverPort; - private final String serverIP; - - public UdpUnicastClient(int serverPort, String serverIP) { - this.serverPort = serverPort; - this.serverIP = serverIP; - - } - - - public void run() { - try(DatagramSocket serverSocket = new DatagramSocket()){ - //for (int i = 0; i<3; i++) { - String message = "add$$$" + 77 + "$$$Roger$$$LocalHost"; //ordre$$$id$$$nom$$$ip - DatagramPacket datagramPacket = new DatagramPacket( - message.getBytes(), - message.length(), - InetAddress.getByName(serverIP), - serverPort - ); - serverSocket.send(datagramPacket); - //} - - } catch (SocketException e) { - e.printStackTrace(); - } catch (UnknownHostException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } - - - - } - -} diff --git a/Projet_POO/src/liste/UdpUnicastServer.java b/Projet_POO/src/liste/UdpUnicastServer.java deleted file mode 100644 index 580a1e6..0000000 --- a/Projet_POO/src/liste/UdpUnicastServer.java +++ /dev/null @@ -1,48 +0,0 @@ -package liste; - -import java.io.IOException; -import java.net.DatagramPacket; -import java.net.DatagramSocket; -import java.net.SocketException; -import java.util.concurrent.Semaphore; - - -public class UdpUnicastServer implements Runnable{ - - private final int serverPort; - - - public UdpUnicastServer(int serverPort) { - this.serverPort = serverPort; - } - - - public void run() { - try(DatagramSocket serverSocket = new DatagramSocket(serverPort)){ //fermeture ne cas de coupure abrupte ?? //TODO - - Semaphore semaphore = new Semaphore(1, true); - - byte[] buffer = new byte[65507]; - //serverSocket.setSoTimeout(3000); - while (true) { - DatagramPacket datagramPacket = new DatagramPacket(buffer, 0, buffer.length); - serverSocket.receive(datagramPacket); - - String receivedMessage = new String(datagramPacket.getData(), 0, datagramPacket.getLength()); - System.out.println(receivedMessage); - - Thread t = new Thread( new TraitementCmdListe(receivedMessage, semaphore) ); - t.start(); - - - } - - } catch (SocketException e) { - e.printStackTrace(); - } catch (IOException e) { - System.out.println("Timedout. CLient is closing."); - } - } - - -} diff --git a/Projet_POO/src/nom/GestionnaireNom.java b/Projet_POO/src/nom/GestionnaireNom.java index f24605c..0434fef 100644 --- a/Projet_POO/src/nom/GestionnaireNom.java +++ b/Projet_POO/src/nom/GestionnaireNom.java @@ -86,7 +86,7 @@ public class GestionnaireNom{ } } - return "0"; + return null; } @@ -98,7 +98,7 @@ public class GestionnaireNom{ } } - return "0"; + return null; }