From 00cedc86d8bd773fd0207a22700874cd633fea53 Mon Sep 17 00:00:00 2001 From: alartigu Date: Thu, 26 Nov 2020 10:12:58 +0100 Subject: [PATCH] Suite connexion() 2 --- Implementation/src/ChatApp.class | Bin 3559 -> 3044 bytes Implementation/src/ChatApp.java | 30 ++------------------------- Implementation/src/Utilisateur.class | Bin 1557 -> 2197 bytes Implementation/src/Utilisateur.java | 18 ++++++++++++++++ 4 files changed, 20 insertions(+), 28 deletions(-) diff --git a/Implementation/src/ChatApp.class b/Implementation/src/ChatApp.class index 17214bc358ab272dbd0fa4f35eb3bba62488d745..952a0cee74d8391ec3b6ec06b9896bbee0262982 100644 GIT binary patch delta 995 zcmYk5-E$LF7{-4m+3ZQSJ2tc!CK=)Rlds(DyGri zc2IRmu*=+-$TfDm?7>!~%C#Wy=c=_pQ&V)cwW_sT;npp4Wq&4=ghPPmkYzTaKd7*> zg>~CBdlfzH^1u&s{si4RQI?` zgF(S6ez>_5mLlv)m#27IdK7Hb4=UkKMLfH%;4r|mk?wO+AL)wl#VGD{=;e8r7kJT( z*&FRcE-&%2Ic#6vG0$O*ae0*^<~#d}O}po*Gvt%!O1g`<7%p zV$1YkX*x6mnkh{uO4Dsiv6v_l$4$oBA(R77uIp`~Sds}y@ec2{1^e8d#yyMN-(u(J z`Xl-y8Ao80at&aoew+$DhHB^Ei*WUaS7+BG?tw>|qTuPBaj zX|y_OesnX9K*rF|m4u8?R5nw4B5Gq_F+zLq}mKP`X5Y6gX~QCLG< z#jsS|Ajl?B*en_&qOyfMxQXrD%rphLV7G9PtzunKx*H=J?l`Gs5#1Nlye9*W<{DVb zTtxg|K+A;{EVTY4q4{808j*KYDj5N^d^_UUe=*#4Xa0AwGtNh%9b zkxWFQ;bsLU15||3CnKWa5c(O4|0(lClV;dVSV5t(TEQUEI~Bwjr1+3I9EvG;fI*1I z5=l-mq#=o6t5K+|Q1Bo_K_srC7>6}Hgd+_0u$gQ<+#VRDN7hh3){0HKE@~#-9$L1C zLJ4zds98lJ9?>A;QR}$iPCcgKaY%#>#-dSkG!l!-c!HrM-(e)?_Uzs{8Z_fcN~jov zuEK?Fy5bn1V#BW6Z4Hj-3>4iiH2Ctn_za5pZV?I2 zlaGzez@FkkLl~FYZ0;;G#4O7Fb@jTih|vr-8saQeL(-)*%5-s#nu{StCu%(nF;DHa zqlDHQA>$@$w*lASW{TW`I^0UXMr3aLu2dV*?Zi0l z#4+3jF5oW6Ic$QGS8w5O4N1ubMsMX+RIMgTen-(2h&hx(`cG;3n&Nh(ky+DpiZoS- ze>sane~qo7hO3d{a%AwZw>FK`EEHc|8sp5Dh09+o{FK3yJ_@$ir}1>LfMumUi>?0p z`jrfxF@!o@NaH!K5E(+SESmg0^n#7AFJ|znA)dkAwF_{ju}2q|@H(iUeH2i2aS?B% zQKfhBT^et5mCxZlhAC|1cOP1p)QZ#?9k+TCcmi$k;U3azRrveJ0+6ihu$#`>y(p*L z2JC?o9fa6Rn0V!Z diff --git a/Implementation/src/ChatApp.java b/Implementation/src/ChatApp.java index 8493817..0330b69 100644 --- a/Implementation/src/ChatApp.java +++ b/Implementation/src/ChatApp.java @@ -44,33 +44,7 @@ public class ChatApp { System.out.println(this.me.getPseudo() + " envoie : " + broadcastMessage); } - public static Utilisateur stringToUtilisateur(String s){ - String lines[] = s.split("|"); - String name = ""; - Integer port = 0; - String ip = "" ; - for (String line : lines ){ - String mots[] = line.split(" "); - if (mots[0]=="pseudo"){ - name=mots[1]; - } - if(mots[0]=="port") - { - port=Integer.parseInt(mots[1]); - } - if(mots[0]=="ip") - { - ip=mots[1]; - } - } - Utilisateur user = null; - try { - user = new Utilisateur(name,port,InetAddress.getByName(ip)); - } catch (UnknownHostException e) { - e.printStackTrace(); - } - return user; - } + public static void main (String[] args) { //Integer p = 2345 ; ChatApp app = new ChatApp(args[0],Integer.parseInt(args[1])) ; @@ -97,7 +71,7 @@ public class ChatApp { } String received = new String(data.getData(), 0, data.getLength()); System.out.println(app.me.getPseudo() + " reçoit : " + received); - app.actifUsers.add(stringToUtilisateur(received)); + app.actifUsers.add(Utilisateur.stringToUtilisateur(received)); for(Utilisateur elem: app.actifUsers) { System.out.println (elem.toString()); diff --git a/Implementation/src/Utilisateur.class b/Implementation/src/Utilisateur.class index 778301c462e3a1d685009841d2670d82c8b9494e..7c4a8d12602a9752492665edb5fe73285a63d8e1 100644 GIT binary patch delta 1026 zcmZuvT~E_s6n@^WUAIzT3^r)ObbJX6*kH)l5D}1%=@=?QMGz^Y&cW!GwV);@-0G!i zh(EzwNEC@CUUB7b@Xl-hfl<#2QG%w;Iqh?v^PG?O-IMpKq%S`|eg-gvtpn*BQzSGa zBBL8U4C0QO+t%hDGx*!$mde#kyU@$Pf)e`BFJeH(Achz`8|sc4$*FoKGH({MdWJzT z3c0Mw(At(b9~^F9vhvJdH7w%_Mi^WLwPaFqhESWe%oOV-=aD41FeyX8l=YpBjf$9I2-wAR&5SJQn|l7KK9e`h$!BS;U}p2W zglXK6aT894$^tcN&YNm_GgVa6nib}9tJQ|xek#9UW^-9XHMQ*`L&N`ONSvVzGnCs( zvuYuwuH`fl_ZX^|{u$kR!wpm{OL&MC5szdvVAcA{9Z#$=$gE&!+w1ut3%&@tu+AW{ zLcVC8{?i$_ShisQ5jn2wT5%$$8irH zYlUywodw`01aO0gM79hSkWr0t;v~^lVp23fo{<+q@8H{~4~9~z(*`|c%P8rD+6ayw ziiJAf!*}q9E7@ob74s2u4!6j5p4V2+Yu6F05~T_WD=gG1rK%@N^`um4>o)G#(G|h( z``c5Hu-23ItyjXxnL(T3Kno3d3H8JX5yy>rq)Hm3eM~cn6z%AxXdmSaQdU3Z4N!+eSfH$n;C>P4 w6wznD&9=QOk`NOy?Ih9rMB}iC2jpweHq)$ delta 483 zcmZ8cNlpSm6n&qDZfrUrGKDCJ18R_f0}eRgfTF00F1&z=EKCRxz_oGV2`bz}65Y6P z<;uM$@E*q3K-8E@-v9OAP`^6IP+oHW~iN{!}jQ@ z`DaAC?D}u?lSY{|#z_t<1O4BX{Qp-Pr)c(P`^!OedL(wHN=D|~-l6~PDQKAHmy=AN jL5d~~t7IKm!#Zn__dLUPdbroaA`Z!zoR)Bm6GXoOeIhn~ diff --git a/Implementation/src/Utilisateur.java b/Implementation/src/Utilisateur.java index 06951f4..4fd57e7 100644 --- a/Implementation/src/Utilisateur.java +++ b/Implementation/src/Utilisateur.java @@ -1,4 +1,5 @@ import java.net.InetAddress; +import java.net.UnknownHostException; public class Utilisateur { @@ -39,4 +40,21 @@ public class Utilisateur { return s; } + public static Utilisateur stringToUtilisateur(String s){ + String name = ""; + Integer port = 0; + String ip = "" ; + String mots[] = s.split(" "); + name=mots[1]; + port=Integer.parseInt(mots[4]); + ip=mots[7]; + Utilisateur user = null; + try { + user = new Utilisateur(name,port,InetAddress.getByName(ip.split("/")[0])); + } catch (UnknownHostException e) { + e.printStackTrace(); + } + return user; + } + }