kcavaill/Projet_COO_POO
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

subscribe, publish, notify et update v1

Browse source
This commit is contained in:
m-gues 2020-12-23 20:08:53 +01:00
parent abf8c14bb2
commit 80a3dcc958
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
POO/src/communication/CommunicationUDP.java
View file

@ -106,7 +106,7 @@ public class CommunicationUDP extends Thread {
protected synchronized void removeUser(String idClient, String pseudoClient,InetAddress ipClient, int port) {
int index = getIndexFromIP(ipClient);
int index = getIndexFromID(idClient);
if( index != -1) {
users.remove(index);
}
@ -124,7 +124,7 @@ public class CommunicationUDP extends Thread {
public void sendMessageConnecte() throws UnknownHostException, IOException {
for(int port : this.portOthers) {
try {
this.client.sendMessageUDP_local(new MessageSysteme(Message.TypeMessage.JE_SUIS_CONNECTE), port, InetAddress.getLocalHost());
this.client.sendMessageUDP_local(new MessageSysteme(Message.TypeMessage.JE_SUIS_CONNECTE, Utilisateur.getSelf().getId()), port, InetAddress.getLocalHost());
} catch (MauvaisTypeMessageException e) {/*Si ça marche pas essayer là*/}
}
}
@ -175,7 +175,7 @@ public class CommunicationUDP extends Thread {
public void sendMessageDelete() throws UnknownHostException, IOException {
for(int port : this.portOthers) {
try {
this.client.sendMessageUDP_local(new MessageSysteme(Message.TypeMessage.JE_SUIS_DECONNECTE), port, InetAddress.getLocalHost());
this.client.sendMessageUDP_local(new MessageSysteme(Message.TypeMessage.JE_SUIS_DECONNECTE, Utilisateur.getSelf().getId()), port, InetAddress.getLocalHost());
} catch (MauvaisTypeMessageException e) {}
}
}

8
POO/src/messages/Message.java
View file

@ -28,10 +28,10 @@ public abstract class Message implements Serializable {
String[] parts = messageString.split("###");
switch (parts[0]) {
case "JE_SUIS_CONNECTE" :
return new MessageSysteme(TypeMessage.JE_SUIS_CONNECTE);
return new MessageSysteme(TypeMessage.JE_SUIS_CONNECTE, parts[2]);
case "JE_SUIS_DECONNECTE" :
return new MessageSysteme(TypeMessage.JE_SUIS_DECONNECTE);
return new MessageSysteme(TypeMessage.JE_SUIS_DECONNECTE, parts[2]);
case "INFO_PSEUDO" :
return new MessageSysteme(TypeMessage.INFO_PSEUDO, parts[1], parts[2], Integer.parseInt(parts[3]) );
@ -51,8 +51,8 @@ public abstract class Message implements Serializable {
//tests ici
public static void main(String[] args) throws MauvaisTypeMessageException {
Message m1 = new MessageSysteme(TypeMessage.JE_SUIS_CONNECTE);
Message m2 = new MessageSysteme(TypeMessage.JE_SUIS_DECONNECTE);
Message m1 = new MessageSysteme(TypeMessage.JE_SUIS_CONNECTE, "sahiu");
Message m2 = new MessageSysteme(TypeMessage.JE_SUIS_DECONNECTE, "putbezfjk");
Message m3 = new MessageSysteme(TypeMessage.INFO_PSEUDO, "pseudo156434518", "id236", 1500);
Message m4 = new MessageTexte(TypeMessage.TEXTE, "blablabla");
Message m5 = new MessageFichier(TypeMessage.FICHIER, "truc", ".pdf");

4
POO/src/messages/MessageSysteme.java
View file

@ -7,11 +7,11 @@ public class MessageSysteme extends Message {
private String id;
private int port;
public MessageSysteme(TypeMessage type) throws MauvaisTypeMessageException{
public MessageSysteme(TypeMessage type, String id) throws MauvaisTypeMessageException{
if ((type==TypeMessage.JE_SUIS_CONNECTE)||(type==TypeMessage.JE_SUIS_DECONNECTE)||(type==TypeMessage.MESSAGE_NUL)) {
this.type=type;
this.pseudo="";
this.id="";
this.id=id;
this.port = -1;
}
else throw new MauvaisTypeMessageException();