From 96b8faca5b0944af83af6d4c82983261516f3f63 Mon Sep 17 00:00:00 2001 From: GustavoHMDS Date: Tue, 29 Sep 2026 03:05:21 -0300 Subject: [PATCH] WIP bugfix --- pitiupi.testSocket/out/GUI/ChatMenu.class | Bin 4300 -> 4149 bytes pitiupi.testSocket/out/GUI/ChatWindow.class | Bin 3750 -> 3790 bytes .../out/GUI/PrivateChatWindow.class | Bin 2281 -> 2291 bytes .../out/GUI/PublicChatWindow.class | Bin 3719 -> 3601 bytes .../out/control/ChatController.class | Bin 2236 -> 2287 bytes pitiupi.testSocket/out/plugin/TestChat.class | Bin 3896 -> 3980 bytes pitiupi.testSocket/src/GUI/ChatWindow.java | 9 +++++---- .../src/GUI/PrivateChatWindow.java | 9 ++++----- .../src/GUI/PublicChatWindow.java | 11 ++++++----- .../src/control/ChatController.java | 11 ++++++----- pitiupi.testSocket/src/plugin/TestChat.java | 17 ++++++++++------- 11 files changed, 31 insertions(+), 26 deletions(-) diff --git a/pitiupi.testSocket/out/GUI/ChatMenu.class b/pitiupi.testSocket/out/GUI/ChatMenu.class index 77a7f11100a4f70015a092a8252c87fcb51bbb5c..65067fef2ec7f61d0bed894adccec041b1c32400 100644 GIT binary patch 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 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 diff --git a/pitiupi.testSocket/out/GUI/ChatWindow.class b/pitiupi.testSocket/out/GUI/ChatWindow.class index 98660b9974e9dcadf32a4b6caf2c35c4bcc01383..6c30a836e57d2d678c37851889b93c2503c3ba09 100644 GIT binary patch delta 342 zcmZ1`dro#jw7Fn%eqLT`a!F=>o^N7aVtQ&3BZIO}L1sy2X+fqwP_m>bKS$pgUD3vd zHWnpCg330_vaVrPQPUu7;O0jhhnRSU8CV!Z7&sY38F(4QCU4{}RF!04V~}DHV2}oi z$pBe$47v;o3^oi(42}%S3~mgn4BiZClihhzWi=VN8MGLL8MJ|Fb%1hu4EhWP3>FMV z4E7AhlTY$QiJAdbSO871V$cAZpvz##V8UQO*@8Dk)Rln)Xcj+%JA(v+C&Ww!pUE3} xZCC>txESIlf8tG734viUGPNc5)S;4gj9wQhERY delta 302 zcmX>nyG(XMv?^C_VrE`=W?o8uIU|FFPeEo$W@$mDzI&*rzAs#6V7L!Gl4S!HYqS!F%#eUK`c`1}=u! q$x?jjih)3P1p{3Y!XVBN3N$4QXn!D3T_l4ZLp0DeF_RbZ=>PzlAwS{( diff --git a/pitiupi.testSocket/out/GUI/PrivateChatWindow.class b/pitiupi.testSocket/out/GUI/PrivateChatWindow.class index 9415b28fc76579583a04a7ed31527a4607367a82..1c2ed39c8e3e83b9c59d0d9fd5d4f3ae4a79cc1d 100644 GIT binary patch delta 185 zcmaDU_*rm5yNa5IPeEo$W@$mDesX?ZNl|`|zH@$FUTShlW`3S;VqRi;YSG38IxMQL zL@2bLXfMB+m30aerw{`xg9rl`gXrW%?2*cnK$bL+FUz3DAkUz~pvYj%pv1t$5X%t9 zz{rrmz`&3(S&qX&T8e=U$W~)uXHaJlV$fy~Wzb|0W6%PM=uB?qFlUsWyq7}<0N`#d Ae*gdg delta 175 zcmew?_)>5}yQH*+PeEo$W@$mDzI&*rzHee?UU+6+N`Cpq)jBLvR=8xXC)&$zmS&y8 z#3{(Y${@_Z#UL_y2YaNl1dt`gAi^NSpvEA_pu?cRV9cP%z{C*C5XZpCkifveP%_zs z!$Dn*ffLA9Wnc%Y69TFeWzb*{W6)%fV9;Wa2GYt5+CUlI$^9JWj8c=2bLap719~LS diff --git a/pitiupi.testSocket/out/GUI/PublicChatWindow.class b/pitiupi.testSocket/out/GUI/PublicChatWindow.class index 01f559275508d01cfa755155a7d194add83af3be..5d2a67b624e30bc5bb1d3e1d458f15ce185f357f 100644 GIT binary patch delta 1337 zcmah|X-^YT6g>}Vr%p$}f^i85C>Uvl3TiZw5F;8jwhBZP5rdOjn_`_-S{4_q`-%&W z`@ZiRq6KmJYT}PD@sAkKD-~QYW-@Q?z3-fR&wcOCk-VN<^~?9cPXLzUV~<)=G-IYG z5{w1gB0;w=Y{Xi_A$N7yF#Nt)Fl=~rLl5{{dp&{l_;_yr9u}DXf9^sRTM<&QO@o23 zK;eI@2`Ev&v3ZRzB2YH0&TO$1)if&DE|A@#x9jeZZUo#*JAM9$RH`D1n1VJ9?PwOr z9D!7a^k|eh1OC`5eVboJCw3^=&45ezRno>#Z(ZCk|>j zgu`aHbye+A0ek(Dnu2;G=+mPy+0$_iCuBnzQf&R^NNUT5lLF%;*4q|}4WmzMID;O6 ztQ6YpQf5||8qOhya2fmsZo>r)7v)a!B$!Nv4VN`s>HDnMMdhtb3m(bPV-0s8y{FQ9 zrr~zddm+7-8gA0FqF2Rh^eK3w;Vlw<8Dq0W`a6MQvqqh&7J0(qt!)tn?@h0|tmP^P zV;a)<09L1~AEK9*z%{OFGU|W@*+|EAXpBp|D}}c^T?r_188<@8z!*X%k~E14CKGBO zBAVY-y;P>13WaMf<9W36;YJ~hdL5@;Pj$7^&6wsoKvago%Tj|el4sIO!XRd8St`&dFfi&21T%;rCKgLnmL%?ct} zr0`Pz7IEYsB98qnBA!$+x`-7lw2~sc6j4hNt0|&}BI^DW!I?{m@be_(RTnuO-6;`U z*yyRzn`hZLFT*k1{1jM8Udy@-j5l$ok+ZRZm$&g}%{tk5R+=2eRLwkoWlf7SfwLon zVr3X`6UrGL1$sUS?MNQ_5Vnk1PX8#_OMj*<<$d2}`ZV0beSQn*zvBA<5BUyRPlm1M QwEBrsnR)<&_<+ej06gsz^#A|> delta 1418 zcmZ`&X;V{46g`b3FTS)}L=hE43lstvTuMKuT@@YF+c1t9>EE9}MW&j4c|rN^CRtSaR(xh-mm*Vmo%2QOm0SyRcis z9*Mp9MbJh_*Y^-4w!4Kiz9~w?4GiUTu;DX?QJxa@52&pIP$YM0#dz& zYr4E~ncj}#n1tagHnTZTN027;`~Y zGIZE*N#Zgx1hhC$S%s=ymAKYkrP;;wI|D3eSEWZ1_n@+v${tJHjb~3(_Eh3FGb^6! zc!8H1UP-*hoAwK~!6N;=K)(5{Z;qbl4hHMPAq^kRuYKp&UFQ`WgEamCtF!1aM3j-h z4Zihwbr39YARRX$Sy%X?1m5l}ia}Gae%(#|(T9+sY|13TFhcE}jb^LvEm5>N(D)v~ z`bfq(a3L2nDPjTgumt(+7?9}5wr`K9j)}~H0`e6i15S)WF{2Vp!gzL;Vkr?-%+_Es zYB2>tOeM=TVmk#lQ@&C)$>~@TLzUb42t#66-GM*L8Lo|?uBbSM&<$j`9kv*nJMh;- z>=ZP%FA^n((mWbX~yM!5r!+!!6=9qo^N7aVtQ&3BZIO}L1sy2X+fqwP_m>bKS$pgUD3og hbrm%Y!s<32JHV*oN`%7A^O;UEshAL>vXRxA82}8cNR0ph delta 144 zcmaDaxJPh8qAFKzVrE`=W?o8uIU|FFPeEo$W@$mDzI&*rzAs#6;tX|3X$>5b8y_EF dl(NDlYdx8tRetkxrj<;Rnz+<#-ok3l3;>e1Gd%zR diff --git a/pitiupi.testSocket/out/plugin/TestChat.class b/pitiupi.testSocket/out/plugin/TestChat.class index 9c672dd8055f2d4ab67bcb894f8ed062799ce86b..29ca5c310cbd9124a60e9e6413b892f6f1fd5b9a 100644 GIT binary patch delta 1147 zcma)5O;b`)7=F%0`MiLcU!bC9C|` zz;e*z-(1gxV<~%94-48v)S{iC!4XO)v++dAvlQFOC=g%YiUu8AWUWCPx)j(YhGByJ zbAzG3s$@w<+3;l%cJ%NVb2}X9(?Am8gp0viEmzqxFEBfE^Y5(1C_|+ukpU5d7~+B; zYi;m~7{MqX6+G&zBF5n3Nnz12fomFE7cq$&{8R`K&M#sbGrU<9rjLM#n+WoxYK;F- zz4vxiS3l=ALtSZ13q^aDqUpo^npJ_c9*KBNT6LP;$*KRcrMg(9)x%F3FJr;OpV|jP zvkFkWq6l0>L-9?+=4peQ)$VmG&nj+_Gw&+we$F5z#}uxjYtBRP*? zmRv_@Jb@)570@~_oxm1x$^~>Dq1z?r(fg5*3{NOpp{6Jk+YLSXsrmpq$#Oe}2(f{^ zl71%yS^?S<$dLj(2f4C@x|kTH_yRj6xQF0MQ)bDTM}JuQOoj6puGBRZ)8kZq0w!D| z+DimWD(yIkVs;*5PRe6JdGg@jjIG{AG+~uw6-S%M zOJJF%xI*hYbZH|r*)_bSzho8NFa@a`>K>CzC%=QyQu`G$Uo(xg--QnMP>(2j$$JT# gG@1MGAWnxp!S_v)`;SM}O+2h_Vw#$m;cD~XZ&G6MqyPW_ delta 1059 zcmZ`&Sx*yD6#iyPDQ$;V1iG;ll%<_%JBTboRhEi?p#<5a#6+7i)`>W6%AnB~o;1M_ zTyESR{0(A|(nw-Vc=o6Gz?+FLo)%~|VkUF$+;h(NopZjqcf*@&e6h7=xgS@x8>+UH zddR^wkydqeHLc2{bK`Qf7zvx;;2`9kk-Kp{s%Wbg)WRje2seis-$Z(OHK}Uytg@o# zGs6CP6Y4lP5-Cm3q?QY?$l>?0lCi*phCH~jhl8KcCs&>LvmjBLaSBZWnsJ8ZxKK+A zT1{vZ&<-C}I+=sn_|`U&L$#*p#qOfY%1S(`Sm1}jLYzSXA;>Jo2P-@{C!iDO*(NWS zcMIr2FWcv@Tl>&&LRi2>Tw-3sDCG?Z7{n0M3{l!d1YE%g+c)(0wqR7i7{*Djq@vHH z6898+HZsMb!RIdyn(szWq~&5b%zha@bh(d*_$SW6naC({U759fun=bg)gsO!$+HK-F*>ysX)1NfZ+AK;tumUdqkqyE|>eoR=6FS&|;Bxq5yO6euspSL#x|p}pvk-`ipW!8{ zjuMrvP`eN1=qIW$WxvA6QD^Po=>e>w^aWi&4i`#5OCdA}3nJ`grDrWLnJ1TmSzIn9 z9kP!S`xxvrDTmiZ_SPeIa{-sda0zzE9YqBu3GxPSj~Ys%tkAAR5PKF^r5vt_SxnK( z+HH;9F1WEsv?YzE;lvDi=jhJN(}`WcI~s^YiJ1zS`IGzD7BKtYqtb2s20!~~>uI chatMenus; private final HashMap chatWindows; - public ChatController(MainWindow mainWindow, ChatMenu chatMenu) { - this.mainWindow = mainWindow; - publicChatWindow = new PublicChatWindow(mainWindow); + public ChatController(ConnectionManager connectionManager, ChatMenu chatMenu) { + this.connectionManager = connectionManager; + publicChatWindow = new PublicChatWindow(connectionManager); chatMenus = new HashMap<>(); chatWindows = new HashMap<>(); @@ -35,7 +36,7 @@ public class ChatController { public void addChatWindow(TcpConnection tcpConnection) { if (chatWindows.containsKey(tcpConnection)) return; - PrivateChatWindow newChat = new PrivateChatWindow(mainWindow, tcpConnection); + PrivateChatWindow newChat = new PrivateChatWindow(connectionManager, tcpConnection); chatWindows.put(tcpConnection, newChat); JMenuItem newMenuItem = new JMenuItem(); chatMenus.put(tcpConnection, newMenuItem); diff --git a/pitiupi.testSocket/src/plugin/TestChat.java b/pitiupi.testSocket/src/plugin/TestChat.java index 72076d1..ddaabdb 100644 --- a/pitiupi.testSocket/src/plugin/TestChat.java +++ b/pitiupi.testSocket/src/plugin/TestChat.java @@ -3,7 +3,8 @@ package plugin; import GUI.ChatMenu; import control.ChatController; import net.TestChatMessage; -import pitiupi.GUI.MainWindow; +import pitiupi.control.ConnectionManager; +import pitiupi.control.GuiManager; import pitiupi.net.Message; import pitiupi.net.tcp.TcpConnection; import pitiupi.plugin.PrivateConnectionPlugin; @@ -16,7 +17,8 @@ import java.net.InetAddress; public class TestChat implements PrivateConnectionPlugin{ ChatController chatController; - MainWindow mainWindow; + ConnectionManager connectionManager; + GuiManager guiManager; @Override public String getName() { @@ -39,12 +41,13 @@ public class TestChat implements PrivateConnectionPlugin{ } @Override - public void createPlugin(MainWindow mainWindow) { - this.mainWindow = mainWindow; + public void createPlugin(ConnectionManager connectionManager, GuiManager guiManager) { + this.connectionManager = connectionManager; + this.guiManager = guiManager; ChatMenu chatMenu = new ChatMenu(this); - chatController = new ChatController(mainWindow, chatMenu); - mainWindow.addMenu(chatMenu); + chatController = new ChatController(connectionManager, chatMenu); + guiManager.addMenu(chatMenu); } @Override @@ -79,7 +82,7 @@ public class TestChat implements PrivateConnectionPlugin{ public boolean openConnection(String ip) { try { - mainWindow.getSocketTCP().createPrivateConnection(InetAddress.getByName(ip), getIdentifier(), getIdentifier()); + connectionManager.connectPluginTcp(InetAddress.getByName(ip), getIdentifier(), getIdentifier()); return true; } catch (Exception e) {