Ako/sae302_applicom
1
0
Fork 0
mirror of https://github.com/Akomry/sae302_applicom.git synced 2025-12-06 08:43:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(Event): 2.6.5: Réception des posts

Browse source
This commit is contained in:
Emi Boucly 2025-01-07 12:55:10 +01:00
parent 2f47614779
commit 48da92717b
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
chat/src/main/java/rtgre/chat/ChatController.java
View file

@ -286,7 +286,7 @@ public class ChatController implements Initializable {
LOGGER.info(event.getType()); LOGGER.info(event.getType());
if (event.getType().equals("CONT")) { if (event.getType().equals("CONT")) {
handleContEvent(event.getContent()); handleContEvent(event.getContent());
} else if (event.getType().equals("POST")) { } else if (event.getType().equals(rtgre.modeles.Event.POST)) {
handlePostEvent(event.getContent()); handlePostEvent(event.getContent());
} else { } else {
LOGGER.warning("Unhandled event type: " + event.getType()); LOGGER.warning("Unhandled event type: " + event.getType());
@ -295,11 +295,15 @@ public class ChatController implements Initializable {
} }
private void handlePostEvent(JSONObject content) { private void handlePostEvent(JSONObject content) {
if (content.getString("from").equals(contactsListView.getSelectionModel().getSelectedItem()) || System.out.println(content.getString("to").equals(((Contact) contactsListView.getSelectionModel().getSelectedItem()).getLogin()));
content.getString("to").equals(loginTextField.getText())) { if (content.getString("to").equals(((Contact) contactsListView.getSelectionModel().getSelectedItem()).getLogin()) ||
content.getString("from").equals(loginTextField.getText())) {
postVector.add(Post.fromJson(content)); postVector.add(Post.fromJson(content));
System.out.println(postVector);
postsObservableList.add(Post.fromJson(content)); postsObservableList.add(Post.fromJson(content));
postListView.refresh(); postListView.refresh();
System.out.println(postsObservableList);
System.out.println(postListView);
} }
} }

4
chat/src/main/java/rtgre/server/ChatServer.java
View file

@ -52,6 +52,7 @@ public class ChatServer {
LOGGER.info("Serveur en écoute " + passiveSock); LOGGER.info("Serveur en écoute " + passiveSock);
clientList = new Vector<>(); clientList = new Vector<>();
contactMap = new ContactMap(); contactMap = new ContactMap();
postVector = new PostVector();
contactMap.loadDefaultContacts(); contactMap.loadDefaultContacts();
} }
@ -225,6 +226,7 @@ public class ChatServer {
break; break;
} }
} catch (Exception e) { } catch (Exception e) {
LOGGER.severe(e.getMessage());
break; break;
} }
} }
@ -246,6 +248,7 @@ public class ChatServer {
return true; return true;
} else if (event.getType().equals(Event.MESG)) { } else if (event.getType().equals(Event.MESG)) {
doMessage(event.getContent()); doMessage(event.getContent());
LOGGER.info("Receiving message");
return true; return true;
} else { } else {
LOGGER.warning("Unhandled event type: " + event.getType()); LOGGER.warning("Unhandled event type: " + event.getType());
@ -267,6 +270,7 @@ public class ChatServer {
sendEventToContact(contactMap.getContact(post.getTo()), postEvent); sendEventToContact(contactMap.getContact(post.getTo()), postEvent);
postVector.add(post); postVector.add(post);
LOGGER.info("Fin de doMessage");
} }
} }