From 23559dcc06b221cbc9d4925f7911b50d503d9f46 Mon Sep 17 00:00:00 2001 From: GustavoHMDS Date: Tue, 29 Sep 2026 01:20:48 -0300 Subject: [PATCH] WIP bug fix 3 --- pitiupi.testSocket/out/GUI/ChatMenu.class | Bin 4149 -> 4300 bytes .../out/control/ChatController.class | Bin 2224 -> 2236 bytes pitiupi.testSocket/out/plugin/TestChat.class | Bin 3334 -> 3896 bytes .../src/control/ChatController.java | 7 +++---- pitiupi.testSocket/src/plugin/TestChat.java | 6 +++++- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pitiupi.testSocket/out/GUI/ChatMenu.class b/pitiupi.testSocket/out/GUI/ChatMenu.class index 65067fef2ec7f61d0bed894adccec041b1c32400..77a7f11100a4f70015a092a8252c87fcb51bbb5c 100644 GIT binary patch delta 1737 zcmZWp32>8D5dL10|LEU`)G#1_ff_)xq$w%N(E|`Dhb@5?3MoNRf7;llgrqhp1w?`e zDj;4@R1^=q5Jj;qO|VtG5fByc1MwDR#u>+P#&Jf+abF0ngOkbscHi!P`@P+Lugi60 zxN-QO?)?B};$*wg#S&RK9~WrI=NJt)Lr#;m((;C_NQ1X#bu1oS!C;TJ#u*0s(w0!v zTip_h#B1U$L2E^s4i7`_wEFr`q`_6!XvJM^p-6qS%@vKfRsa3|g~<3`d+`xQJs2#)(6$Se?Kz5ye8Y<+D;zWE-4436nKU;kX!6MU8DKn=aaI zgU*_PnHpws%*G`QLq(Q-sQAq`Q7=Iyhk`kx$X>zbiZ%8jwLaK2RA*?c^2Ug3gST>e zYdju}=vY8RDk7n}kkw+K3WIelV$jR2NL?^&wP>hia7zBYfz?(d7}gLFzu0qg7voZy z?lJ}?zoKHa-+&*N%bhEP%i+qluuMZ8M?HdKj>E6}(ZJD&kl5w$7B4>&*=H>ahIPo| zS5%i8Xp(H286362SX?5vaEwGuONlni%ANbf z0kxGHbU()f*e=SoLbC)9aXbu_Ae*ha0q6V_YUZV- zg(Q_adf*TAU~wSF$T3n_lETtb#Z;swfBSG{5?7t}(e;dnYN|bG3OK_lM4X9e5?7n5 z#~G*flj$Q?&PH|~;E+*;`N6qtH9?n!F}rjo?A1QqDP0(s&j9x0$?kM~upg(?f2N7WjI zv*Csb4_%Q$`GjFQif91G(z{TE1sF&7cs$~mfVI?vEtrI@)XwenFzv)t?7=j2p`4~= z2F=z?9Hpn}7%FfQ^O5+K!hc5%{=z~AEXuLTp~|#z0X0b_3g;5ZCrTCfUTBi^u5B

4)sbV!5zgS#&?M3mp|}aI@8Bxg zf!X9s!=LfZBga!CMJYSZ^vxySbZz=@dttlIbR9rLekjfOFy5wWP+=YToHmc(9r~Y= ej`m6)_DY|S^bG~dhhzr6#rIQ9{D2eq8Row)$%nuI delta 1681 zcmZ8hYjhJ;5dLnGeRR8pvS49RN@)+0CR-v>UM&c1d8L#B1yX}nT-rzjC0mlT1qCW1 zz7h3`isD;DLBvv;V59gJMMQkz^Z4Ii{@|w`k8{%q%E>uK@R!7LqB zsOBy1kZNI$4hc8#j63L=$56zNbJnj;CiD~O1WGTg>c?&T%&DBdp>)wGkib&*&yLToqW{$`fv!VahBUzSmH2u_=* zls8Ax5v4jAd_15QQMDo#=QHF$eiB^@x^?tm3*RhTY71`HaR;{XgR*ya3wG$}#hnaV zB9aV66VY`Y)KrgmO?gPgT_i%I6Hm6QxSPzCBv88n7w!@Ba4*kOstamSY`~2NMC3uf zLg}Ku?a}ct_VRN|g=yhY9gjh#lAU(zMhzAo*Rc;z@KI`IfrTBSpZj$@jc533wJiTx zJg4A!9WUTTzDu1m)xygBqADK#SR6B7=|rc9Sqdb3^hk%ZBCB{6|d_! z+<#HE7#rv>(MGfS%y0=Gh&LbV7(`~cjE{x)iH?(ao4nJ)`%Fg)X+oY6-WNLhaGc(K zso@;HQgB|!*Z8J?XZ}dWzUTY&GS80;6Zvp`G(Vp|OjhtSLvhYkxKvOo9ieaL4Q>@w zv!lGdU}Eo^I3^jMIoum@D}{J z^ioQ95k?kC-pe^!Hd;&*F`lf$kcaSWH(7bqU&b=9!oHK3Y*Ze{^fYESWH2|JM$OU; zYQx6-G!`~ytwm&2c`^uwGguNX)C#pUmZq`1N-`zkiQh@AOo84HVN^ATkWD#*mawrl z4cl0kLYpaD#(Fw?hoI50l*UF;OEDGGlR~W7R4T-gP1{UqRjR2TMNS53}B<$B_BaCF|2m*5_n>O9^7L%)ocJFwevf_=%)6{{f&FXifkC diff --git a/pitiupi.testSocket/out/control/ChatController.class b/pitiupi.testSocket/out/control/ChatController.class index ca920e427fb677d286ac65fc5ac27d2463ef750b..b7ce85e3f4bd953cafb63c74097ef3ee3cae6379 100644 GIT binary patch delta 436 zcmYk2O-~b16o#KWQ|3=Y8{jZr zn{T(K>i=+6GA1bKKce8fObGgSk59h%N3D~O2Q5E!^%5|t=poeKM6oZXB6*~kVp`vd z9p|xPmM1!ImBqYXw2JN=&r}oDxThSmC$kS$fulcpDyY?Fq|IBC3E!$kAFPw$!85wL~UEev;Mi~Fb z4}alb6YS^4JCqH`B}7+7B50XeG9Q6KV;dq%kpjc`ctkv8ni1A0=@sc6&RmeWx@K`4(}r2RC{B3(E=}+7V#hE;Q6*(6QNnVZF(MP1IWVe3>4S~o?W@vFzEVi3<-^kDnO*fF zj&WBpL69^b>`wWlg^VeVX(Z&AmTD28Ud&>SVV+|Fi!w+v&C5tJtZ=Miji6ob&~|xG z`vU^&92*D|uP(;y93l7-R-LK77?Iy>$q=q3BilUBfBPX* A`v3p{ diff --git a/pitiupi.testSocket/out/plugin/TestChat.class b/pitiupi.testSocket/out/plugin/TestChat.class index 6cbbacaf48ce8cd9595bc426091f4cf5e6eda2aa..9c672dd8055f2d4ab67bcb894f8ed062799ce86b 100644 GIT binary patch delta 1591 zcmZux*;gB76#sqMCYcNn0!l+=Jku;B(bG0S$-xF!z3Q@9%EEZ#i4JRxSSe*ZNNY zy0Eq+9y2sLX??eZdvGsKjnfTIWew3-Hs1+H7!A&d9!mtj2tO zGpZ_&CzODQHuwbuB<#llhDseW=S$DV3DmF4K`ow$YjGvbV2`VrBco1C-j+8Q$%qTo%Xtg%rkc7kN;Z?>~ z`@;wd2uV1CUOr+RuskB65B+?_=(Z1HNWid!V;JFo7%#9$SK8aHT5)!7M@=mj#P4fkFU0V_<31-lw z=BCjOHx-*H%~7y1B}#;Ry*(;wgU9ysL77 zq3qwlp5Csxh%&9kld6Ez{D7sgC5&ezJgfI;)smErc-CoqUcy ze9rCGy6!JUT*g-dzLxL}zGbK{oQsVe_673=LW(9&$Pq1>ny1a5+WPlfQ;?V18u@u^ zfbX;w@toB`y37#J%@wAB`DumUuvV3pSn!>Q@9~3xMVLk-&W{q7ujCLYk5ytyt7gF z+)g6_UXsl;;9lz0hg!4{CW_bd$R*LWCC5Ipy@7Pzb3?4{({mKVNV1J)_tQE+zBlPP z*qD7c5vfyY_juQ_4_L!}1+v7vs~sXb3C{6WK5ehPGJAgkw2}P~Wj~A(^bq9j|FSo3 zX195+qQ;v;M}-<{akzW|#RFxG$o}W&Rm%f7awOEnbGhZ(7Ef%ap?zYJ)9O zaT}Fs#?zZRyV*`XjR}mA^#q*s^z4QV4|U&+2(=KUeVNF&Rs-WrcmyN`Xn#|zQGi3h zMKXX<%aX&OUrey$d8)Rv``mVR4^r6{pG`matF3xs=L0qe+-Pvo$>vv_!MRjn zB9oiVpS8Gy2W=i=Kz*<8_75>^@UYDzJgWZC$9;!v9%EDuc{=@Z5(bak9Oj5x^<37* zRlvK=e~bx(Nt-0c)gEte>li0&PBN-trJX{|Sz1b^ohGUEl+9^U>VkLJKf|nnWAh|w z^}DxU%cy{_y>E`EY`mP&@ZLQ&(0R-tr_ns0T1jWqh}pS(a=HEUQbtJ6q0bZ26Bkk{Di{aTW@he9qt*^{cNVG{$o_&$~66g}h|T z@QK^Or>e{PP5VM={;>9yiu!w7 zU!YFfYiEa8*upJh8;~yWi7l#g{!npEeC`c`V$U<`M&!0#PS>k98CT`dSQA?ThUE6* zO@Q^Afo_hMZUXezfc=$}ZGx0-iv7QKLk(F0b_nDGFS|e$v-gzC4@pB178|9JE-8H% zZFCFfBp0hG+hi1OJLU$R$#o)|^Y%*g70y)A-GbHy9SBECL}THfXpNTWxhAg4AR5cz zeH4B4iDtjJUuAEV-63pu@bxZF65LbcS>?b1Ob!b8HD0e$dL*AmD8aDkMB`;*SBZT! zW<_yORxm_Bo|ncOB3P^pY_sD28n2=_B8rEE^CoXq71N^UwipquK#7Bq>kNiVjJRKk z*o5aw><5lYHB&cu0!mElSA+`NXl6{>Sd;%yygd3iTSOa4CROTMQ0U-l};XaE2J diff --git a/pitiupi.testSocket/src/control/ChatController.java b/pitiupi.testSocket/src/control/ChatController.java index 96a3361..2363df2 100644 --- a/pitiupi.testSocket/src/control/ChatController.java +++ b/pitiupi.testSocket/src/control/ChatController.java @@ -20,7 +20,6 @@ public class ChatController { private final HashMap chatMenus; private final HashMap chatWindows; - public ChatController(MainWindow mainWindow, ChatMenu chatMenu) { this.mainWindow = mainWindow; publicChatWindow = new PublicChatWindow(mainWindow); @@ -28,7 +27,9 @@ public class ChatController { chatMenus = new HashMap<>(); chatWindows = new HashMap<>(); - chatMenu.newMenuItem(new JMenuItem("Show global chat"), publicChatWindow); + this.chatMenu = chatMenu; + + this.chatMenu.newMenuItem(new JMenuItem("Show global chat"), publicChatWindow); } public void addChatWindow(TcpConnection tcpConnection) { @@ -36,10 +37,8 @@ public class ChatController { PrivateChatWindow newChat = new PrivateChatWindow(mainWindow, tcpConnection); chatWindows.put(tcpConnection, newChat); - JMenuItem newMenuItem = new JMenuItem(); chatMenus.put(tcpConnection, newMenuItem); - newMenuItem.setText(tcpConnection.getAddress().toString()); chatMenu.newMenuItem(newMenuItem, newChat); } diff --git a/pitiupi.testSocket/src/plugin/TestChat.java b/pitiupi.testSocket/src/plugin/TestChat.java index de25242..72076d1 100644 --- a/pitiupi.testSocket/src/plugin/TestChat.java +++ b/pitiupi.testSocket/src/plugin/TestChat.java @@ -8,6 +8,7 @@ import pitiupi.net.Message; import pitiupi.net.tcp.TcpConnection; import pitiupi.plugin.PrivateConnectionPlugin; +import javax.swing.*; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.ObjectInputStream; @@ -57,9 +58,12 @@ public class TestChat implements PrivateConnectionPlugin{ chatController.receivePublic(testChatMessage); } + @Override public void receivePrivateConnection(TcpConnection tcpConnection) { - chatController.addChatWindow(tcpConnection); + SwingUtilities.invokeLater(() -> { + chatController.addChatWindow(tcpConnection); + }); } @Override