From 351bc56e73888e15c48cd88768be939b2857ebc8 Mon Sep 17 00:00:00 2001 From: Alla509 Date: Fri, 13 Mar 2026 12:57:21 +0500 Subject: [PATCH 1/6] =?UTF-8?q?1=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.gitignore | 5 + .idea/misc.xml | 6 + .idea/modules.xml | 8 ++ .idea/vcs.xml | 6 + ...0\274\320\265\321\201\321\202\321\200.iml" | 11 ++ .../gui/GameVisualizer$1.class" | Bin 0 -> 701 bytes .../gui/GameVisualizer$2.class" | Bin 0 -> 706 bytes .../gui/GameVisualizer$3.class" | Bin 0 -> 929 bytes .../gui/GameVisualizer.class" | Bin 0 -> 5627 bytes .../gui/GameWindow.class" | Bin 0 -> 856 bytes .../gui/LogWindow.class" | Bin 0 -> 2580 bytes .../gui/MainApplicationFrame$1.class" | Bin 0 -> 837 bytes .../gui/MainApplicationFrame.class" | Bin 0 -> 3268 bytes .../gui/MenuBarFactory.class" | Bin 0 -> 4267 bytes .../gui/RobotsProgram.class" | Bin 0 -> 5419 bytes .../log/LogChangeListener.class" | Bin 0 -> 148 bytes .../log/LogEntry.class" | Bin 0 -> 651 bytes .../log/LogLevel.class" | Bin 0 -> 1390 bytes .../log/LogWindowSource.class" | Bin 0 -> 2507 bytes .../log/Logger.class" | Bin 0 -> 858 bytes robots/src/gui/MainApplicationFrame.java | 134 ++++++------------ robots/src/gui/MenuBarFactory.java | 123 ++++++++++++++++ robots/src/gui/RobotsProgram.java | 97 +++++++++++-- 23 files changed, 284 insertions(+), 106 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 ".idea/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200.iml" create mode 100644 "out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/GameVisualizer$1.class" create mode 100644 "out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/GameVisualizer$2.class" create mode 100644 "out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/GameVisualizer$3.class" create mode 100644 "out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/GameVisualizer.class" create mode 100644 "out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/GameWindow.class" create mode 100644 "out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/LogWindow.class" create mode 100644 "out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/MainApplicationFrame$1.class" create mode 100644 "out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/MainApplicationFrame.class" create mode 100644 "out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/MenuBarFactory.class" create mode 100644 "out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/RobotsProgram.class" create mode 100644 "out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/log/LogChangeListener.class" create mode 100644 "out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/log/LogEntry.class" create mode 100644 "out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/log/LogLevel.class" create mode 100644 "out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/log/LogWindowSource.class" create mode 100644 "out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/log/Logger.class" create mode 100644 robots/src/gui/MenuBarFactory.java diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..b58b603 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,5 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..f5bd2df --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..514065c --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git "a/.idea/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200.iml" "b/.idea/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200.iml" new file mode 100644 index 0000000..8df936b --- /dev/null +++ "b/.idea/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200.iml" @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git "a/out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/GameVisualizer$1.class" "b/out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/GameVisualizer$1.class" new file mode 100644 index 0000000000000000000000000000000000000000..3f0bf76a0961dae8407aef10125e84e62b8f361e GIT binary patch literal 701 zcmZuv%Wl&^6g|_pacbPyd64pclmJPJ2;Hy=ViSdj6hZ}6P?wWrlunt9#f)7fR{RnY zFR|bQ_$b63CsKt{OTOpM@tHIC-tnKmzkUN4;BJ5o6nuCgHc@1#obXfL%~GkluO}yB znp%dk5g#&X#3<3DOeuzYtzj-xT+dgsUVEL|LJ3^|oUF_t#tN`4Zi zxzA8ckELxsqVL0XK`%fVk&ie;1yzRHS$T(YAocz(*nOIFTxpTJk-2j?Wz5duRUq{q-Bb0QUlHpy0y`v56u><%pm1Zk9^beKR={ z)6_DQjrf>JBSwiHWlAyJZw+&q;(ET4_1f#y7E0Li5rnvakfA=$WcMXsh_SR8SMrlE z&0U6KdMIu45q%%73wi;{hT>O#?uTm_6QS9Ox#l}*K>$pKHAj&NnZc@HUvd=MzcTlD1yq^-f&85y)_}@`G qGj-Pucnlv;a^rBRTN!&)wX5?s?htx(k`eCaOdUIdj0`l=XydVo7~%#J7FLjC$er;E-UtKfG>-ab zVh|{Xv@hO=(idIN?S_uSuwCgyFo(ON8LU}dOsyh?RRgAlE3g>WMxkuHvKDg4GnAsb{6o+X7s3r1hhC_}^C3SEgiloa(v`t8 zhIpmgGqHwi1_~C|ah+jf*`IAq!jKw?;MkKo%vWX?(KVtRNhqRZ;D&{p*d)ZFN@|-D z!3p;x9wh_mxeWHKOP5SqR1sSiZtJ@kzBuPm(e=u*t5Jxg@3~P z4rTHkZ@`@%_oY71k_p{PhQboI@?Mi6dnkfaZ+OgongVrOkf?JpTX%YZ5 siD@5sJe{j!|E*)Ajt4}Vz(c~uu!9Eq1noiwyHTcyN90Yyq{!3r2b$~E`2YX_ literal 0 HcmV?d00001 diff --git "a/out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/GameVisualizer.class" "b/out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/GameVisualizer.class" new file mode 100644 index 0000000000000000000000000000000000000000..5acf845665e412303baf88e4e2d4048153188b49 GIT binary patch literal 5627 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 T-o`t;KA}XV_NV0kB|85Gy&kNV literal 0 HcmV?d00001 diff --git "a/out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/MainApplicationFrame$1.class" "b/out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/MainApplicationFrame$1.class" new file mode 100644 index 0000000000000000000000000000000000000000..68ca1c790248cf70d29189cf490ccf13f8dd5336 GIT binary patch literal 837 zcmZ`%+iuf95Iviuv1{DeDW$X}rCdTuf`lnN1|g~_6-a4{1WLu@##yCXx$9uB8y@*3 zByQq?58$H^vrYsRG?qLwJ32FS=JNB`_a6YdXgDaKXrbg{31x=rDL>~yrezcy4Npa= zQ-(?+-eoco{aE$0C}P-c^m16l)p!nTH~)7n!^W}&$Hf)63|r$&28Ud#{mCSfA=ffi z2MIqD^*x5NK9Ont5utjEU~LB#couvYRje}9at?f|192{t4vwW7#nb%}pJ z(Kf^waj4DKayf{>c^zj-C=R6IyLs7i9-1jrcU=|ED$kfP*nN@e7jdc?+?Ps;q!aNp z6)A4f+ADNi%=gXW$tuua#Rln3vN|Z{9LczH^On`AE$?1N9>9jZz6$@QGHsb;r6!TN%$f0LR!2Oh)1lM9LMKZ$MJ#vO_- c;V$6{sN){#65Wl5-Q2T=`=lMh*re(E4d8XcD*ylh literal 0 HcmV?d00001 diff --git "a/out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/MainApplicationFrame.class" "b/out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/MainApplicationFrame.class" new file mode 100644 index 0000000000000000000000000000000000000000..cf439b48ec4261b8a6ebbbc42510b3847d80a4b1 GIT binary patch literal 3268 zcmZ`*`*#!95&qVey;$Dh2ZmtGL!_k05{V&cN@JT)W5+~BG8EaSB(1|*TFZ;2T~)in zhNNvmOJAf-n!fUC={tSbP+L~;iTithTK_*iJ^k)oSq~0yjCS|lnYlCHd^2 z0A9rXAezvuBA}rKtqQuY>euw;0cXjyG6NIi1wCgdXdN~!(|tifbGUy-#SR5~8^p#8 zXVJCu7j(-ALPc{M+M%gh((*o$5Tk5MU^ zDj0^9G;c7{J@pD>X3nr2Iy=;cKI~UCs(>VIRz(!FESYI{L4gtz(uXxXAw*jj z3^TLf28qZK4Nu~;3fdgQJ!2QGw4*=`$M~;*M(l?*^dq8RC-+Bf%QY-lAgbW;a4iV2 zK_rdBkgs%1!&7)#K?j4-T_bL1E}2%^ULqb0MF3x2V&LsKuHgipp%Z#Ky)Ajjw_nYA zjAs`tJu7p>b5wkeUI|-gNe5pmh-c9(eokum0-k3i^xDU;g)s@GAp#{cZ&<}MdSP5o zxpv`t5Q8`+$VNIH2ulwiMhzL>Aik(!1ZS8hKfHu*ij=D4sp@lON5(j&k=Wx3+Ue3n zRi*cVD7Q6)t1ppzk0R-j6G5ECDFNO&4RIt0Z56z@=`c@5LBSJsNiwc6cLP39+Y$_D z2hJ>m+>kYnac$;2{I-gSP?bAE(B?U*lJ6v3q2G=N5l1EU$Ta#9VSuU-pNRm+vb#^{4 zD$=jsir`Ex007Yiv_I{opAl%EcNgEW~%MzD|tyEpt$5m8^WxT;}M&|7dRZu`AU zte+G=mIhmN5mj^%_7B04uW2ZNl`X0`!M2$z=KQj#ui|RkkTjn~QNuOSeFJ$twYUSz z3J!aBm_$K@P47PcZ-n@{;@y=?E8g1HO##LY4X@#K_MWscS7d&6SMuY7>LV}WQ1J~7 z-^3g2;H0jC$V2m3*DGtu4dN!grQ+KfZs9vDlLqEAbP6VfG0&KeIhQ5$f$+=X=@sIoowE6zmLV z5*bX5i$%vVb*pM;%2;NjeHTAb@ly>y!_OaZH@QS6PP=B-bWMXP+Fi`2*)yxLPH_%Q z#~$pr+bkD-;ync+Ie8?&qgmZ?CT(|IH1ijiQ--V~6(2N6#Vp6wE!UJ|uTJWtMyYJp z$mrRTRLXFiI;meNh&F&`ImLY5F1SXz4zQ{MVIQ^AM86}>Au(CZ%^8I$UFM@(&^J4y z7fkV8Sq!)fCXv|p=srwxnHIqo*{vItJ++ZkBQwVei_I@I;X*_4avTIR)%n5lm)o_8 z!u|Ff`+H?hDCqH>YM34r>JUAm?k2$*TQD3>eRhka%lb*^`AT#x^Zxy1zjU@bD;ii! zi)|^HNO{%iu4`tM)}>;N?WLCXIu8$DS5?jBL_y+=L<0LAbS;#hD@L zV>md>uF=HH7{{f!FY&E~@4Sui_YRjkSiY@XeJ!#MC9(na@;chq5bS(rxQxyc_9P;G zeaBX@udihx&1XnFOZZGAvWj2{MGDB;5qz8+K}PkxA+~ux?$q?IK*IkF^50kk34A@r|~iVgl5_~ zfj{FfJkP)${1tzb;QW0X99-eI0Iw&~J=uMsxwVX`;l2-`Hka{b;dQh0x|{mI^8|W? zUZ24(j7d-S__`HO+R=u8NKgJrX~O?s>|#NQ3znY>yiR-KwBs9?y zdiA8lLU_WfTg8)ev?o025J~1iU%wP(9^b4bYA0O5zteUPf+)*)1Wvt*X4Jx8L zR}A0cQ)qTZ%lK{?Z$--Z@y7@x?n(&TY3mo<70>r8&krllUsk~0C)qkn`Bxe270S+2 vdXA@M>b&TzdeMn{_!mzVpsQ$_RIw`ZR^n$9)=}m&!0og6gl|Fl#uwoK`eS`Q literal 0 HcmV?d00001 diff --git "a/out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/MenuBarFactory.class" "b/out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/MenuBarFactory.class" new file mode 100644 index 0000000000000000000000000000000000000000..5077bfb0585de9d0f6f59ca0e6b2919d122f784b GIT binary patch literal 4267 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 literal 0 HcmV?d00001 diff --git "a/out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/log/LogEntry.class" "b/out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/log/LogEntry.class" new file mode 100644 index 0000000000000000000000000000000000000000..1fb6da68d1578b4a45fea5aa2fc9882575fd4c0f GIT binary patch literal 651 zcmZuu%TB^j5IwgP3Z+0r@coP%sK$N(#*M*M)dhyc6)AXAOG=xxg~Y$oL}KE?5AdUm z(@P@=rpdfI=bV|jU*8{}0NOZIAt9qc){sSxK_A)^+w^STG4J|AK8P7|7q0KdmkgOk zvs*wO1qG^xA~Xig3mnr5oVFi_&ySP_^c4oj7!TriYE(Iz z!BEErWki5Yl3^m+q8^FjZS15nCi&!F)_8;RLV<*YJSU2}Ak=0JDIvoy_NbD~xCkyS MgX{l-_l3m44|QaCiU0rr literal 0 HcmV?d00001 diff --git "a/out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/log/LogLevel.class" "b/out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/log/LogLevel.class" new file mode 100644 index 0000000000000000000000000000000000000000..0094a3418dec4101da550e71f1da65e73f6b643d GIT binary patch literal 1390 zcmZux-*XdH6#j1ZXO`PG4YXJ&SPN_hvQ^HKG&AR(V=e2(ivmYL%~VZK)XA6;zh$Z2op56RSAC&}V( zhWmSQu@mj3w5-0NWc@hn3e`^Di_+bwNF-2Lt44A|8Bvm(11e`^KdHNn z`vTXQuSIQ@Ql4Oh#XoT71fzfD(M^7=E1= zJx1XxY*4$w<1p+;fpS@3nPhh;ZMt;h((*IB+c@_->c3JSr<d>5_bI&PKK{j>EjOClYBq%BISAT z7qeAAw5(^i{1leauGqHGJfnT=I7SPM_KE8nZN_Lvnr z5YQ0R5kgp?{g$z2j1&#KFmiSAmbv5!gwI*F<&6mhlBwBdM9{1us-p$EKxfe@jO3ld zoMkUNccz_+yJQONDJ@vnDrUvZn|8rl5fC{Idw5$JuXt8*v^l}MbV0O>3pw1 zFqx}*=+v{b4Ldh(bje=Pg=*sW%JS*P^B&r@AG5MyYv{0m7(>C3*JdEo&h(kng zEHBeYvTCIv!ffige1BL+9})t4OAE%5XRVnMow6d(b0hBuI=;fx)Q^<+qdJaB2VvJN zIcuhd;{v*WeZuzK^(gw0lp&@BjwWlC^5&XZ%r>Bz_FT&@WK**m1_*Rlhccic9m5zA z&^$+FQ6QPT(O{>_TQ;@Jo`ysV(m1K(9Z9zC*yOGn(y}ytTE{5PkchJNHF+fAxhT#e zqamx~9L^KgHV5NQu}Fbfj!kl!&C;r;2o>l^rW&Y{X=I+>!vzf&b-a&p3S?VllZF&X zpk&zsp=2&6J+@*($7OuL7|WGKX+U6~JlkoOey6R1ZFm)zaQhpM>-suZ%eSH;JC+p~ z{>OVe7?ux$S$xYxuT_ZcNq-F&oMPHTz-L=qmToY)W_Kc<5lg6roq+zaBdrI~*E3R|L z51?Yd=|60&u9`NBCBg`lOvzZyS5>ww&9diCR%=t{VVh82#$?l!;%|6bWq^5nqrO6} ztSZ*oHpvQUj(L$lnYQM#XSm*F*D2BRl2fs%35{LHygTE_3aG2&wTHW~A25nVf&Dd& zzIL5{j_-P~i=Ak-+g-M#5caW-8hIX;`9OkgrHO4e$X~Wg&YEOjgTNIv&!I#1tor&x zRtI|!&ou6_CGz(pu1sYCNTjzQ((w&w=_hENk8h!E108C)@F{#cZs05~Pm7|<}OmOVdxQ0)Bm){X;kY|1AN9dlP{7nu6n>a9+78~dt ze10F1sln$%&mQughHiQQ{|~7#fNcbQJUxPT93_HdILuDCji9fNpbyiSq32I&r3X!~ zXolaUh=#OA`$EI)UqmDD*}vgC@?Y_#h;M-S28nNo_=f)%zImjo`4d^63R>ligY>N#U+)PF@(9NDY_yuygG&J zxQ-hPUhaL4FX%lA2VY`=USqh)zXVev3GPGaCB`-MYdArACltHdOSEt;#Gm9|$gfZ} zk;Ey52}ET2HgW1l&YP6L!fOAD!X@R)J3bl#1B<*RYv)_~mqH$he~&$J-^dTp9^>5y z@q;)0jmH=plhgR2O(x|ssHc-?W2JO5AqnbF>Nj0ASr2{yOR9qC2Fsi^@n)1| wtJ97QnGK*V;1~T@gj&Fg4{wAk2|XmeOUI3|%{9ap@|{&Xhs8&?)a~1U11cX3BLDyZ literal 0 HcmV?d00001 diff --git "a/out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/log/Logger.class" "b/out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/log/Logger.class" new file mode 100644 index 0000000000000000000000000000000000000000..75ec665673e220b88222947353b42c43bb9971a1 GIT binary patch literal 858 zcmZ`%&2G~`7@SR0l4BqRfeqEs9=@nT#VyK5OE0ZM}p_I~62=9`(_A3wi-2XKI03l&sN7&dB{6KEgHQ`w7T9Q0ldkJTs> znA;2EFnc0Ub=*M%bu>&^Hkz;ntSAY3UJ?WG#=`^kp_ z?l;iFf{C_`MJx%}bWE(;Si=>8eN8usQw8GmUu&z&)s~T%w2O>9FJ>pkr zw0jQmiHiz0`PMfFY%thziz~a>gxlC+)xaHWmjsVd&HpveV4h*V`vuGY(zHpp_!mtR zJGh(EIRBx!I*X=5n$?*!F1n?fja&<0P|Zh<5V;#|77U<{d%uml)UBWSZ&-QL_Rq2L V8KzcVv=jlDG+rlipLhiiegTC7p$Py0 literal 0 HcmV?d00001 diff --git a/robots/src/gui/MainApplicationFrame.java b/robots/src/gui/MainApplicationFrame.java index 62e943e..e236f67 100644 --- a/robots/src/gui/MainApplicationFrame.java +++ b/robots/src/gui/MainApplicationFrame.java @@ -2,14 +2,12 @@ import java.awt.Dimension; import java.awt.Toolkit; -import java.awt.event.KeyEvent; - +import java.awt.event.WindowEvent; +import java.awt.event.WindowAdapter; +import javax.swing.JOptionPane; import javax.swing.JDesktopPane; import javax.swing.JFrame; import javax.swing.JInternalFrame; -import javax.swing.JMenu; -import javax.swing.JMenuBar; -import javax.swing.JMenuItem; import javax.swing.SwingUtilities; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; @@ -25,19 +23,16 @@ public class MainApplicationFrame extends JFrame { private final JDesktopPane desktopPane = new JDesktopPane(); - + public MainApplicationFrame() { - //Make the big window be indented 50 pixels from each edge - //of the screen. - int inset = 50; + int inset = 50; Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); setBounds(inset, inset, - screenSize.width - inset*2, - screenSize.height - inset*2); + screenSize.width - inset*2, + screenSize.height - inset*2); setContentPane(desktopPane); - - + LogWindow logWindow = createLogWindow(); addWindow(logWindow); @@ -45,10 +40,33 @@ public MainApplicationFrame() { gameWindow.setSize(400, 400); addWindow(gameWindow); - setJMenuBar(generateMenuBar()); - setDefaultCloseOperation(EXIT_ON_CLOSE); + MenuBarFactory menuFactory = new MenuBarFactory(this); + setJMenuBar(menuFactory.createMenuBar()); + + //закрытие приложения через крестик + addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent e) { + exitApplication(); + } + }); + } + + public void exitApplication() { + //так как в UIManager уже установлен русский язык, то не нужно делать это дополнительно + int result = JOptionPane.showConfirmDialog( + this, + "Вы действительно хотите выйти из приложения?", + "Подтверждение выхода", + JOptionPane.YES_NO_OPTION, + JOptionPane.QUESTION_MESSAGE + ); + + if (result == JOptionPane.YES_OPTION) { + System.exit(0); + } } - + protected LogWindow createLogWindow() { LogWindow logWindow = new LogWindow(Logger.getDefaultLogSource()); @@ -59,96 +77,26 @@ protected LogWindow createLogWindow() Logger.debug("Протокол работает"); return logWindow; } - + protected void addWindow(JInternalFrame frame) { desktopPane.add(frame); frame.setVisible(true); } - -// protected JMenuBar createMenuBar() { -// JMenuBar menuBar = new JMenuBar(); -// -// //Set up the lone menu. -// JMenu menu = new JMenu("Document"); -// menu.setMnemonic(KeyEvent.VK_D); -// menuBar.add(menu); -// -// //Set up the first menu item. -// JMenuItem menuItem = new JMenuItem("New"); -// menuItem.setMnemonic(KeyEvent.VK_N); -// menuItem.setAccelerator(KeyStroke.getKeyStroke( -// KeyEvent.VK_N, ActionEvent.ALT_MASK)); -// menuItem.setActionCommand("new"); -//// menuItem.addActionListener(this); -// menu.add(menuItem); -// -// //Set up the second menu item. -// menuItem = new JMenuItem("Quit"); -// menuItem.setMnemonic(KeyEvent.VK_Q); -// menuItem.setAccelerator(KeyStroke.getKeyStroke( -// KeyEvent.VK_Q, ActionEvent.ALT_MASK)); -// menuItem.setActionCommand("quit"); -//// menuItem.addActionListener(this); -// menu.add(menuItem); -// -// return menuBar; -// } - - private JMenuBar generateMenuBar() - { - JMenuBar menuBar = new JMenuBar(); - - JMenu lookAndFeelMenu = new JMenu("Режим отображения"); - lookAndFeelMenu.setMnemonic(KeyEvent.VK_V); - lookAndFeelMenu.getAccessibleContext().setAccessibleDescription( - "Управление режимом отображения приложения"); - - { - JMenuItem systemLookAndFeel = new JMenuItem("Системная схема", KeyEvent.VK_S); - systemLookAndFeel.addActionListener((event) -> { - setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - this.invalidate(); - }); - lookAndFeelMenu.add(systemLookAndFeel); - } - - { - JMenuItem crossplatformLookAndFeel = new JMenuItem("Универсальная схема", KeyEvent.VK_S); - crossplatformLookAndFeel.addActionListener((event) -> { - setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName()); - this.invalidate(); - }); - lookAndFeelMenu.add(crossplatformLookAndFeel); - } - JMenu testMenu = new JMenu("Тесты"); - testMenu.setMnemonic(KeyEvent.VK_T); - testMenu.getAccessibleContext().setAccessibleDescription( - "Тестовые команды"); - - { - JMenuItem addLogMessageItem = new JMenuItem("Сообщение в лог", KeyEvent.VK_S); - addLogMessageItem.addActionListener((event) -> { - Logger.debug("Новая строка"); - }); - testMenu.add(addLogMessageItem); - } - - menuBar.add(lookAndFeelMenu); - menuBar.add(testMenu); - return menuBar; - } - - private void setLookAndFeel(String className) + /** + * Метод для смены Look&Feel (публичный, чтобы был доступен из MenuBarFactory) + */ + public void setLookAndFeel(String className) { try { UIManager.setLookAndFeel(className); + RobotsProgram.setRussianUIManagerText(); SwingUtilities.updateComponentTreeUI(this); } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) + | IllegalAccessException | UnsupportedLookAndFeelException e) { // just ignore } diff --git a/robots/src/gui/MenuBarFactory.java b/robots/src/gui/MenuBarFactory.java new file mode 100644 index 0000000..c286689 --- /dev/null +++ b/robots/src/gui/MenuBarFactory.java @@ -0,0 +1,123 @@ +package gui; + +import java.awt.event.KeyEvent; +import javax.swing.JMenu; +import javax.swing.JMenuBar; +import javax.swing.JMenuItem; +import javax.swing.UIManager; +import log.Logger; + +/** + * Фабрика для создания строки меню приложения + */ +public class MenuBarFactory { + + private final MainApplicationFrame frame; + + public MenuBarFactory(MainApplicationFrame frame) { + this.frame = frame; + } + + /** + * Создает главную строку меню + */ + public JMenuBar createMenuBar() { + JMenuBar menuBar = new JMenuBar(); + + menuBar.add(createFileMenu()); + menuBar.add(createLookAndFeelMenu()); + menuBar.add(createTestMenu()); + + return menuBar; + } + + /** + * Создает меню "Файл" + */ + private JMenu createFileMenu() { + JMenu fileMenu = new JMenu("Файл"); + fileMenu.setMnemonic(KeyEvent.VK_F); + fileMenu.getAccessibleContext().setAccessibleDescription( + "Управление файлами и приложением"); + + fileMenu.add(createExitMenuItem()); + + return fileMenu; + } + + /** + * Создает пункт меню для выхода из приложения + */ + private JMenuItem createExitMenuItem() { + JMenuItem exitMenuItem = new JMenuItem("Выход", KeyEvent.VK_X); + exitMenuItem.addActionListener((event) -> { + frame.exitApplication(); + }); + return exitMenuItem; + } + + + /** + * Создает меню "Режим отображения" + */ + private JMenu createLookAndFeelMenu() { + JMenu lookAndFeelMenu = new JMenu("Режим отображения"); + lookAndFeelMenu.setMnemonic(KeyEvent.VK_V); + lookAndFeelMenu.getAccessibleContext().setAccessibleDescription( + "Управление режимом отображения приложения"); + + lookAndFeelMenu.add(createSystemLookAndFeelItem()); + lookAndFeelMenu.add(createCrossPlatformLookAndFeelItem()); + + return lookAndFeelMenu; + } + + /** + * Создает пункт меню для системной схемы оформления + */ + private JMenuItem createSystemLookAndFeelItem() { + JMenuItem systemLookAndFeel = new JMenuItem("Системная схема", KeyEvent.VK_S); + systemLookAndFeel.addActionListener((event) -> { + frame.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + frame.invalidate(); + }); + return systemLookAndFeel; + } + + /** + * Создает пункт меню для универсальной схемы оформления + */ + private JMenuItem createCrossPlatformLookAndFeelItem() { + JMenuItem crossplatformLookAndFeel = new JMenuItem("Универсальная схема", KeyEvent.VK_S); + crossplatformLookAndFeel.addActionListener((event) -> { + frame.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName()); + frame.invalidate(); + }); + return crossplatformLookAndFeel; + } + + /** + * Создает меню "Тесты" + */ + private JMenu createTestMenu() { + JMenu testMenu = new JMenu("Тесты"); + testMenu.setMnemonic(KeyEvent.VK_T); + testMenu.getAccessibleContext().setAccessibleDescription( + "Тестовые команды"); + + testMenu.add(createAddLogMessageItem()); + + return testMenu; + } + + /** + * Создает пункт меню для добавления сообщения в лог + */ + private JMenuItem createAddLogMessageItem() { + JMenuItem addLogMessageItem = new JMenuItem("Сообщение в лог", KeyEvent.VK_S); + addLogMessageItem.addActionListener((event) -> { + Logger.debug("Новая строка"); + }); + return addLogMessageItem; + } +} diff --git a/robots/src/gui/RobotsProgram.java b/robots/src/gui/RobotsProgram.java index ae0930a..468cc39 100644 --- a/robots/src/gui/RobotsProgram.java +++ b/robots/src/gui/RobotsProgram.java @@ -1,25 +1,96 @@ package gui; import java.awt.Frame; - +import java.util.Locale; import javax.swing.SwingUtilities; import javax.swing.UIManager; public class RobotsProgram { public static void main(String[] args) { - try { - UIManager.setLookAndFeel("javax.swing.plaf.nimbus.NimbusLookAndFeel"); + Locale.setDefault(new Locale("ru", "RU")); + setRussianUIManagerText(); + try { + UIManager.setLookAndFeel("javax.swing.plaf.nimbus.NimbusLookAndFeel"); // UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel"); // UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); // UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName()); - } catch (Exception e) { - e.printStackTrace(); - } - SwingUtilities.invokeLater(() -> { - MainApplicationFrame frame = new MainApplicationFrame(); - frame.pack(); - frame.setVisible(true); - frame.setExtendedState(Frame.MAXIMIZED_BOTH); - }); - }} + } catch (Exception e) { + e.printStackTrace(); + } + SwingUtilities.invokeLater(() -> { + MainApplicationFrame frame = new MainApplicationFrame(); + frame.pack(); + frame.setVisible(true); + frame.setExtendedState(Frame.MAXIMIZED_BOTH); + }); + } + + protected static void setRussianUIManagerText() { + // JOptionPane + UIManager.put("OptionPane.yesButtonText", "Да"); + UIManager.put("OptionPane.noButtonText", "Нет"); + UIManager.put("OptionPane.cancelButtonText", "Отмена"); + UIManager.put("OptionPane.okButtonText", "OK"); + UIManager.put("OptionPane.titleText", "Выберите опцию"); + + // JFileChooser + UIManager.put("FileChooser.openButtonText", "Открыть"); + UIManager.put("FileChooser.openButtonToolTipText", "Открыть выбранный файл"); + UIManager.put("FileChooser.saveButtonText", "Сохранить"); + UIManager.put("FileChooser.saveButtonToolTipText", "Сохранить выбранный файл"); + UIManager.put("FileChooser.cancelButtonText", "Отмена"); + UIManager.put("FileChooser.cancelButtonToolTipText", "Отменить выбор"); + UIManager.put("FileChooser.directoryOpenButtonText", "Открыть"); + UIManager.put("FileChooser.directoryOpenButtonToolTipText", "Открыть выбранную папку"); + + UIManager.put("FileChooser.lookInLabelText", "Папка:"); + UIManager.put("FileChooser.fileNameLabelText", "Имя файла:"); + UIManager.put("FileChooser.filesOfTypeLabelText", "Тип файлов:"); + UIManager.put("FileChooser.upFolderToolTipText", "На уровень вверх"); + UIManager.put("FileChooser.homeFolderToolTipText", "Домашняя папка"); + UIManager.put("FileChooser.newFolderToolTipText", "Создать новую папку"); + UIManager.put("FileChooser.listViewButtonToolTipText", "Список"); + UIManager.put("FileChooser.detailsViewButtonToolTipText", "Таблица"); + UIManager.put("FileChooser.fileNameHeaderText", "Имя"); + UIManager.put("FileChooser.fileSizeHeaderText", "Размер"); + UIManager.put("FileChooser.fileTypeHeaderText", "Тип"); + UIManager.put("FileChooser.fileDateHeaderText", "Изменен"); + UIManager.put("FileChooser.fileAttrHeaderText", "Атрибуты"); + + UIManager.put("FileChooser.acceptAllFileFilterText", "Все файлы"); + UIManager.put("FileChooser.newFolderDialogTitle", "Новая папка"); + UIManager.put("FileChooser.newFolderPromptText", "Имя новой папки:"); + + // JColorChooser + UIManager.put("ColorChooser.previewText", "Предпросмотр"); + UIManager.put("ColorChooser.okText", "OK"); + UIManager.put("ColorChooser.cancelText", "Отмена"); + UIManager.put("ColorChooser.resetText", "Сброс"); + UIManager.put("ColorChooser.sampleText", "Образец текста"); + + UIManager.put("ColorChooser.swatchesNameText", "Образцы"); + UIManager.put("ColorChooser.swatchesRecentText", "Последние:"); + UIManager.put("ColorChooser.hsvNameText", "HSV"); + UIManager.put("ColorChooser.hslNameText", "HSL"); + UIManager.put("ColorChooser.rgbNameText", "RGB"); + UIManager.put("ColorChooser.cmykNameText", "CMYK"); + + UIManager.put("ColorChooser.hueText", "Оттенок"); + UIManager.put("ColorChooser.saturationText", "Насыщенность"); + UIManager.put("ColorChooser.valueText", "Значение"); + UIManager.put("ColorChooser.lightnessText", "Освещенность"); + UIManager.put("ColorChooser.redText", "Красный"); + UIManager.put("ColorChooser.greenText", "Зеленый"); + UIManager.put("ColorChooser.blueText", "Синий"); + UIManager.put("ColorChooser.cyanText", "Голубой"); + UIManager.put("ColorChooser.magentaText", "Пурпурный"); + UIManager.put("ColorChooser.yellowText", "Желтый"); + UIManager.put("ColorChooser.blackText", "Черный"); + + // JOptionPane (дополнительные настройки) + UIManager.put("OptionPane.inputDialogTitle", "Ввод данных"); + UIManager.put("OptionPane.messageDialogTitle", "Сообщение"); + UIManager.put("OptionPane.titleText", "Выберите опцию"); + } +} From 860940f5ee9a426ea3cbe6b261a2b23fad955e10 Mon Sep 17 00:00:00 2001 From: Alla509 Date: Fri, 3 Apr 2026 15:02:43 +0500 Subject: [PATCH 2/6] =?UTF-8?q?2=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gui/LogWindow.class" | Bin 2580 -> 2580 bytes .../gui/MainApplicationFrame$1.class" | Bin 837 -> 837 bytes .../gui/MainApplicationFrame.class" | Bin 3268 -> 9333 bytes robots/src/gui/MainApplicationFrame.java | 136 ++++++++++++++++++ 4 files changed, 136 insertions(+) diff --git "a/out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/LogWindow.class" "b/out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/LogWindow.class" index 5eb4e2625b7b6fe39e619d8bd9f45aed9c4614a1..6905baafb792d81cd7bf86219d879f8ecddb8388 100644 GIT binary patch delta 22 dcmbOtGDT#=Uv^F=23`g}1_lPE&1@WeOaMN=1O5O2 delta 22 dcmbOtGDT#=Uv^F*23`g}1_lP9&1@WeOaMRs1RekY diff --git "a/out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/MainApplicationFrame$1.class" "b/out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/MainApplicationFrame$1.class" index 68ca1c790248cf70d29189cf490ccf13f8dd5336..0ce82699016b74424fdaa3e17d38dd9e2b024308 100644 GIT binary patch delta 23 fcmX@gc9dF z=YN)ah8Mo?+znuseCa_yWEgOn$V8UFd$E6szpX5~G!SYmJFOz(Z?*(klLMhZY>FUb z^qBbu+=9WqhRw91i(}!IGyEaT0|Ob^$bo5~zlmJrad2a6psdOt2u*8g2?px?u|PQF ztejKdGgUBT&Y_l_|NW?BvY)?h3}8#sE5-Y$J4w;6~bCWc~|pg$+o)I}^SR1>(AQW%sz zVP>G&3PpL4N!d6YBMcOo7>Oes0qQkVLj;*i1NE^cfmEu|qf8v7hGsQcfySnoI@&QN zMq`X1J8H$Ihg(DSQGqeKl7Gg`SN$a>#^P8(F8gPMLoq89Q_>b3HoE5!s)JItB9rV% zWhTbqILeEMpqS=_8*QOc9z2RtN{XcAd%TGga3Y!T*E`}BjIh^FA)=CdM?(If)*tsV za1yyvYn@7{*z0>R0U7F1ZekK9^CaZjmSHB(WHUF##3@RdgOxIqtJ?FUTB`=8QJNY$ zR;YElKT_eZi-jZ0JeZ0Z3av8*!$<35^o1=ggQ=)6aVln0nYIk7?4`J^qs-L7oE|NR z(@dO>If5MWeOhXY?*LIGXDA_56TF8)`KaSOsKN}T#xqTvg&N8~CE+=ND3xhN1V^N4 z(po|Vm)X)tj&PJZ&%}If1X2GIN8VaoZk#PRD{)Krnxe$E#P-C_?kl^mN^D7V@VPzF z)qQIKnOE^R!OtRq}^wS;9U39Tk*NajUi_lL^BBm-mScEzQ^(HJdB%Oes zRa^{R znd6MIRb_V&LXBuq2)#t%tj{6J1{x7H5mWY|a5g7wJ4Qt>SC6G8+LRkIlpCT0Quw*l z#E)^A?FOpolbc(cZM#Z$11Z0w5z~k(O#DP4#?|7lTkOV_f{}@PsYC^Y-HA^A>ndV% zQ)06wZAxtKzDfyWg^86|Mdwv-Eo!BH3LX8}LbWBY&SBtc6W8Ech6lo0P~4{;)0}OO zay?js>kZss;zq2c3H3rw(kVEh!b2g=4@3itf)u@L^f_wln{kVQTTT2_@mZKYdtPOg zKjhcSQ$BM}IJ|gTsJ_Cof*$+~w;Q;_#5yIF0SW|Xg%^cm(K909Mg}}0m^035jYb3h zP->l8tBs!e=eWzj-6rnAy$7&cvy@1j7YhUfv4BPIUD(=EPp6wYYb^uGyvhR|b`s?Z zk@pFTbm-Coo)Pp%qt)S9g^C8V+UhKAM+P3~HL5Zcjrl{dfR3qYqt^Ex6%1O9{@}E_ zIx8AY8`Ul-=_RyKw6&!r9En-=X#z`|@Q`4jX0eqAEu*|ztcW_U2OCrp@rc0G-GOjf zMIdOYJm4`Ck7E-tK4WfmMdhg%R#eWJMZcbA){YT-un}97)vQuq+e~anoH3F{8;wz( zOg+vq(BZh3GG~X%P)lo!3t0YU4|bqa&F@n2&0gObr43;NcA40XCkY-EaBIDjz^(II%i)dnAnF|9DF(l{^_>k!Ef<`ffr4@ zgqO*)W=0QC$k)(yxA-Gbi_Jq=U!@zrPqMnqjc&Rv&9+WA-1q~r#D*S54Ku!>0t}$M-M)y@=|{>@t*d< zG^1H<3~%*Ty^c{zMIV^>P}yB(T`(NA417%Q+H>;Srbu|HpC<0XNBFCWPw`*$({w8} z1ZITjwbB%)WtEyi#TocKxf(TJIX4ZtUoe&F*`~U+d65;V2uGUz z|G__!>*zgFLntijzKVR%wa^xl8DY9wz09k>Ht`Mi5v$Gq#dHB7y7mQuSQEdrxf0Gt z_ko&2i1S}2zQuQhEw^Tjry(%dZNPq$`J~vvL$TG!H1UI){ zpi)>x%r?cNh}k60PG+!Tn$llU^GQ8G>4xN)k}m`39oRW7XeW;p!idph&eae~WnsO1 zJ_G3*DKKTAQio!pHV{+D*dv2XIZSy6BM_a{+!9;nr6hbx=I?lUo%z~}41BF(%fGyE z=`YFf(laQUWbqDRe`R|ayEN@6Q;yc&CJ?Qx3y0JeqiF-ejJ%MM=3tn6;kIXvHRV_} zGdmEi^0%pgY)Bb>OVYC_H#oO7*5jq56kFUfUNBS#ouU>y=oE3=hCpL$M0;}TS57eH zM43QCi8AXY*h+eQTKaO!Dd){ec#icQLqQ)H?k(@dEzGiZaodZ~^8?*V>tmUb`Fb1NM>7nmg#hMa23Y$YIl zu`KH~g!*gpN2?iF)!5TaIbE1^yFw%!Xj=|Q-NHmWt2CCx!5OBUDQA%z`k1J)utWIC zbCd*XmHXbObUWXa1wvEGvMy=$2YLKnsg1MO7*5(F=a_P?f^}BV3N7kt5&XR1*!4|a%FiW zBw<5ZOu0mzF)cn!=e^eQGf6ddd~ljxG8MValx2#nu4D@8 zhWt30DlFoX(PU6xHs6YcQ-04Qmntab3vO-K!{w)~FRJZ3;KjHWx{4 zHa5yCQ&y{}&-*M{R5JPIoi;#t%|)9&g6ZC$7$Ku^t;y2Vxg7Uy)C4R(2Dm}d46K9Ee;=~Pfx zVx)~wV$wmUz;I36G${G_?9(2c6OkX`sKPX4rgX}_Ogf(y&L3p=YvXhr1Cu%q@Yr5S zIWb;3dhMc?CX6$+E%K0z&J6*@okDX%SZnQ2PLOjQmU@S2(zCQoID7aHMg~J3=Z)EB z=m&7Cm|V(#^b4*4&%#gMX0w}>r{^ITXN$$x zSM{M(9i51&wxUcIRIuKi@0TYjth>;zF>q$3a~CluzOnWCiRmfutLl9G~Jm{|77X7`okca^?8 zs%pXi%H|&^Okq+jOi1}bZkUJ~QtGh7WYjICNq+VyMoVpm-li<2G>s!>ruDVOKvWI?bjc@9ti!${MO_p>Dpr5}S%d%kM9O*@=6)uVLS2c5GrTgz{a^i5(oZ zRT26Wzbc(5s<%CZWTy@DcLu1hgWysPX@hyu;?hjff0r4e;^ zJ=QkVQf1Kgl`JnyKK95b@>fGXrPCJX(WA6I>RdGtS`uDtmDvfy44t5+9NQh~si`y2 z2JCEqs6J>#N2$wUYfB%QN18G9npnH6#p+|YZQ^B`qh!=Qc!?SQV6cYi1})L746#C50V(c+v2X{nx5HB$M}GeJ$sH(&!&g;2bm-V^7(O(!sh;m6)jN)(i;K6x z6Gt(}mR1)Z8^`!AOyK;99}+g1@SBWG&Yab0L!*nz+f zgy)pxd-5szNXY;hJ0PPdj@IImIF`h*jIYbR%R6vYiBh&L&%>!?uxguw8gf$0v(KX> z=TnjkD8aMSxEkkhm4lh`)G#pRM!;Cy220;2B1 zw1xAWg*jQ)$(>YysEU`fFyDG+en|&z>cDNq9k{a{uBy%49%MTgzi{67JMRab_b(lR z57BCF;`jg$doky~LPHr~p*xOux$yh#7+mhMKg{w>pG(=-CqCDc?U-0i^4~h~6+lqrkDuUjc+ONS zaUi)abSbv^b)^1Md{dC8;yzx{Kf=R!44e6$f?aru_c8mu*AaXJe3Vif?~==itxM@< zE+f7!C%&%0$+(iES8}CQ#Q)W_(`(RxYZ1kDSk9~MTHL^D616Yw;`G zgqLv(x^XMsB24~)JG2sSq)LZlq_*G;?%>lF?Bcq!ptPyZM#LJxb|8j-Wo5 z^UdF?sL!?V%02vYlcObaul$0b>&7U(o{KvT)9Yn&{}bdsxnD!_D+e-e?3D-PK?1b^ z@5_4mC2dPt>|_*@2Z?3Tew5lasr?dN`(=~U8mhkGCTO(*b9An^Em zhy%R!+?M7l)k)wHH1s$B)EM}F0Z~&Nmwu^Mg00L{>s7Ygsn(lp9i3xttg!~(xx4ePCL@3jp~qNQhOBJv=WE5GDF(;S9M9LHa{6hQ!0?-;&S}4 zaXHBWzWO)-`1u6BOze~&Y2a@rTzxW9M&lzXmQp#6?_AarrV`M$%Z^|e)p-wXL0l~Ua9^uzCn1tw~3Zkqh*ul*$6%It_Gg*2}9(N#G1JCz3TY*wG$#)oO zV2y!2`*6cQk-4Adn}n=vVj6o8WHt2w$bM!Lvi#}OhO8@#><%O&>ynT?$XB`!aD)yT z6#^Cfc2CI4m|zqdg<1CtbAv)-e7W1_R@lt;Wj{wuN^VJ9%6AHXzc2UrJUeBk@TZS` z>Z?-dGxn6{_;L!QDlT)^;hhp+PF!ky*>Rb-4&A<-4AowkpH&~1^UBQYo z<5c@=Qe8SJSCi@$$#O>JX;PyiH94ewO}bc-7Aul8PZ*#{k#v&R=PvADm|K`vm>-vD zp?4ijpPNP$Ye#P3fOW{$t)=Z4SYF`E_7%kCvQD{N!?qoT<^6rxo$?c>nbp2OW2GVO z-@o?5Za<0sc_}#b-uh33jr4_u!-q%@se}fVAP1a)H zVwrP~jKbS8hSkXNtjV8*cWDV9&=TI0>2#)NvVdNT4`n{Nxd@*~9X^!?yeL6@Mh>52 zp1N0Y#suzjy4)|c)x_z_r!$whPd1ak4y@Awpg;Fstph+VIf%*@T1_7LxJb70E1%p{ z$u`-J0pzJ%;{5V*R}WX&!7|o*?A8`%@+LW?-g@kDUCJJBPKFFwofb0QfcHBLO@<7Hqh7&5+1n-&;5!VnE%jS?44Ji`XDjGy zq&}6dOH6Ap6P~Mx*z%I{~t_Zu4-WKKIDFbe*0<7Ntb|)DvF`vKL}&=32xb$ z^a&`|nIhmVkSjZ6#THrFDOZF3@llm7iq4YhKlnWYF6rdEpLEF+e7i`kl3o0|6a$5! zQg-X-Q~LR9{d`(KpViOj_45V&d`Ullr=JP^d__NB)z8=U^G*HyqkjHLKmV+s@9O7! Y`uTx;#{E?xzKU=Dk9qkzIoFo;FUAP86)478LbW6kv$D=PFZZ5(_SxsW{L}NZ$NtN| zw|)ZfAZ{($uR2_CtH|frjC+=T-(z#(UXJ_V5nGtg;YE>(VvZ7&iUX{o#fx%|EhuGB zX2Q|POwtYqDmkjKl_4h)PIkuUW77!+wYrx+HKX#pnxh7qFjzqGbJSwH_={;u9mfvT z3$Lke{CV!XAn)h8e7cTr;Yog~2V8`oppL zPJM2lK9!8mowB1DyE&|AV<@f`*PMl1l4!;rjt+E+zfA#UFQ?Y`iAuAd^@u@p>85V% zmOS@!1ko?fnw!ivJS2WIkFh~fYw@!oanMp^djumKqZkwCETfKb98__L<54^&{;*V( z9A?-g*#zT}jSh57s+i)KMp%?t+if94B(WJ0u@*OlaFpYi?94%(1>;kCG8&KB5kjLh zF^)Jq)OKXOZAtHOjyWX6kJegu2=g2#p)goZ=u^jRctYH^Znf!H3wTk*OB^p##;=Mm=T*F>;sVD-p{Vta*CABA z!Ep(1iY|4Ky)7=ORqV1@Bm18Clk5jVwQaw#;Ot-p?%+}Vq#l^nW0Am6axNN+w5Yf# z${iljp1&)_dt6bkB99^~#a1X}Kct`Ypi&H+)>gr^HK^mO z$hir-v%WPAr-6cg&Fl5ApwMfbnI>N*y@3i%TY=rcHqC%;{7)I3i3t<6@=V>Qrjpo>a%%inqp^et0;6Fwr_mSO0H1s;luh;uPTB?!=a z(1=R3((-p;8~RX<5nA*^@F5I8Vsv8>4fq%|hqm>G@CiO8NH?PR45ier2b1_5Ur?!5 zwBriCgqeVL;3~eNf?*WkYkZTD=i3c=FhS2!zRj9@!2PgUNn^Oxdl{-ZjRTUlIYZk` z`9Kp%-GNjdI+2gPk_$m*lCxAC$ia6RD%a?YCU6`1v{mvgU7rTd5TMMcTSI6(jfqtp z3HqFNCn+8ExtQN&E;BHz`3xL4aDrUYy^zK!-*w7aSFj{S0|k1BOE1yrBLVl5Xh9OI zpUMpUk5=6sT2&b}Bo+FX$Wqx)fRaj{95hurJLaQNK6Q6ixx^J1qMn9nvqm<6Q!*!u zETijKCPXF|KZ|^xyi9fa(s(|NSF|*iuE5g2oKew1U~kc>^zUT-yIKE!R`0^hghO=y zFm*dYcaPBRNvak>@UHI8J2ag59yh40)Ln&XK*frjok5Q#tRhX`LdV_sfg*b*q5$|0 DMzsx~ diff --git a/robots/src/gui/MainApplicationFrame.java b/robots/src/gui/MainApplicationFrame.java index e236f67..1e3ef54 100644 --- a/robots/src/gui/MainApplicationFrame.java +++ b/robots/src/gui/MainApplicationFrame.java @@ -4,6 +4,11 @@ import java.awt.Toolkit; import java.awt.event.WindowEvent; import java.awt.event.WindowAdapter; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.Properties; import javax.swing.JOptionPane; import javax.swing.JDesktopPane; import javax.swing.JFrame; @@ -23,8 +28,10 @@ public class MainApplicationFrame extends JFrame { private final JDesktopPane desktopPane = new JDesktopPane(); + private static final String CONFIG_FILE = System.getProperty("user.home") + File.separator + ".robot-config.properties"; public MainApplicationFrame() { + loadWindowState(); int inset = 50; Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); setBounds(inset, inset, @@ -40,6 +47,8 @@ public MainApplicationFrame() { gameWindow.setSize(400, 400); addWindow(gameWindow); + loadInternalWindowsState(); + MenuBarFactory menuFactory = new MenuBarFactory(this); setJMenuBar(menuFactory.createMenuBar()); @@ -54,6 +63,7 @@ public void windowClosing(WindowEvent e) { public void exitApplication() { //так как в UIManager уже установлен русский язык, то не нужно делать это дополнительно + saveWindowState(); int result = JOptionPane.showConfirmDialog( this, "Вы действительно хотите выйти из приложения?", @@ -101,4 +111,130 @@ public void setLookAndFeel(String className) // just ignore } } + + /** + * Загружает состояние главного окна из файла конфигурации. + * Если файл отсутствует, устанавливает размеры по умолчанию. + */ + private void loadWindowState() { + Properties props = new Properties(); + File configFile = new File(CONFIG_FILE); + if (!configFile.exists()) { + // геометрия по умолчанию (как было в конструкторе) + int inset = 50; + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + setBounds(inset, inset, + screenSize.width - inset * 2, + screenSize.height - inset * 2); + return; + } + + try (FileInputStream fis = new FileInputStream(configFile)) { + props.load(fis); + + int x = Integer.parseInt(props.getProperty("main.x", "50")); + int y = Integer.parseInt(props.getProperty("main.y", "50")); + int width = Integer.parseInt(props.getProperty("main.width", "800")); + int height = Integer.parseInt(props.getProperty("main.height", "600")); + int state = Integer.parseInt(props.getProperty("main.state", String.valueOf(JFrame.NORMAL))); + + setBounds(x, y, width, height); + setExtendedState(state); + } catch (IOException | NumberFormatException e) { + Logger.debug("Не удалось загрузить конфигурацию: " + e.getMessage()); + // в случае ошибки используем геометрию по умолчанию + int inset = 50; + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + setBounds(inset, inset, + screenSize.width - inset * 2, + screenSize.height - inset * 2); + } + } + + /* + * Сохраняет состояние главного окна и всех внутренних окон в файл. + */ + private void saveWindowState() { + Properties props = new Properties(); + + // Главное окно + props.setProperty("main.x", String.valueOf(getX())); + props.setProperty("main.y", String.valueOf(getY())); + props.setProperty("main.width", String.valueOf(getWidth())); + props.setProperty("main.height", String.valueOf(getHeight())); + props.setProperty("main.state", String.valueOf(getExtendedState())); + + // Внутренние окна + JInternalFrame[] frames = desktopPane.getAllFrames(); + for (int i = 0; i < frames.length; i++) { + JInternalFrame f = frames[i]; + String title = f.getTitle(); + if (title == null || title.isEmpty()) continue; + + String prefix = "window." + i + "."; + props.setProperty(prefix + "title", title); + props.setProperty(prefix + "x", String.valueOf(f.getX())); + props.setProperty(prefix + "y", String.valueOf(f.getY())); + props.setProperty(prefix + "width", String.valueOf(f.getWidth())); + props.setProperty(prefix + "height", String.valueOf(f.getHeight())); + props.setProperty(prefix + "icon", String.valueOf(f.isIcon())); + props.setProperty(prefix + "maximized", String.valueOf(f.isMaximum())); + } + + try (FileOutputStream fos = new FileOutputStream(CONFIG_FILE)) { + props.store(fos, "Robot program configuration"); + } catch (IOException e) { + Logger.debug("Не удалось сохранить конфигурацию: " + e.getMessage()); + } + } + + /** + * Восстанавливает состояние внутренних окон после их создания. + */ + private void loadInternalWindowsState() { + Properties props = new Properties(); + File configFile = new File(CONFIG_FILE); + if (!configFile.exists()) return; + + try (FileInputStream fis = new FileInputStream(configFile)) { + props.load(fis); + + JInternalFrame[] frames = desktopPane.getAllFrames(); + for (JInternalFrame frame : frames) { + String title = frame.getTitle(); + if (title == null) continue; + + // Ищем запись с таким же заголовком + for (String key : props.stringPropertyNames()) { + if (key.endsWith(".title") && props.getProperty(key).equals(title)) { + String prefix = key.substring(0, key.length() - 6); // убираем ".title" + try { + int x = Integer.parseInt(props.getProperty(prefix + ".x", "0")); + int y = Integer.parseInt(props.getProperty(prefix + ".y", "0")); + int w = Integer.parseInt(props.getProperty(prefix + ".width", "300")); + int h = Integer.parseInt(props.getProperty(prefix + ".height", "200")); + boolean icon = Boolean.parseBoolean(props.getProperty(prefix + ".icon", "false")); + boolean maximized = Boolean.parseBoolean(props.getProperty(prefix + ".maximized", "false")); + + frame.setBounds(x, y, w, h); + try { + if (maximized) { + frame.setMaximum(true); + } else if (icon) { + frame.setIcon(true); + } + } catch (java.beans.PropertyVetoException e) { + Logger.debug("Не удалось установить состояние окна " + title + ": " + e.getMessage()); + } + } catch (NumberFormatException e) { + Logger.debug("Ошибка парсинга конфигурации для окна " + title); + } + break; + } + } + } + } catch (IOException e) { + Logger.debug("Не удалось загрузить конфигурацию внутренних окон: " + e.getMessage()); + } + } } From 525f5f31abbc1a9bbeed21df934b9f9804b8b5a1 Mon Sep 17 00:00:00 2001 From: Alla509 Date: Fri, 10 Apr 2026 15:55:51 +0500 Subject: [PATCH 3/6] work with config in another class; determined names of windows in config --- .gitignore | 38 ++- .../gui/MainApplicationFrame$1.class" | Bin 837 -> 837 bytes .../gui/MainApplicationFrame.class" | Bin 9333 -> 6280 bytes robots/src/gui/ConfigManager.java | 96 +++++++ robots/src/gui/MainApplicationFrame.java | 242 ++++++------------ 5 files changed, 205 insertions(+), 171 deletions(-) create mode 100644 robots/src/gui/ConfigManager.java diff --git a/.gitignore b/.gitignore index 2c6eb38..3c86586 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,40 @@ /.metadata /robots/.settings /robots/bin -eclipse.bat \ No newline at end of file +eclipse.bat +out/ +/robots/.classpath +/robots/.project +# Translations +*.mo + +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +# IDEA +.idea/ +*.iml + +# Maven +target/ \ No newline at end of file diff --git "a/out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/MainApplicationFrame$1.class" "b/out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/MainApplicationFrame$1.class" index 0ce82699016b74424fdaa3e17d38dd9e2b024308..9f61521e423079c3cfa637d457912c3cd635bc93 100644 GIT binary patch delta 23 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 WeewuF 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 Y`uTx;#{E?xzKU=Dk Date: Tue, 14 Apr 2026 17:41:48 +0500 Subject: [PATCH 4/6] moved ConfigManager in another package --- .../gui/MainApplicationFrame$1.class" | Bin 837 -> 837 bytes .../gui/MainApplicationFrame.class" | Bin 6280 -> 6286 bytes robots/src/{gui => config}/ConfigManager.java | 2 +- robots/src/gui/MainApplicationFrame.java | 1 + 4 files changed, 2 insertions(+), 1 deletion(-) rename robots/src/{gui => config}/ConfigManager.java (99%) diff --git "a/out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/MainApplicationFrame$1.class" "b/out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/MainApplicationFrame$1.class" index 9f61521e423079c3cfa637d457912c3cd635bc93..3ada3302b64607b3fa3def5bb1e7a53f885bc5a9 100644 GIT binary patch delta 23 fcmX@gc9d7$x4YM2sdo;sGXu}K5Rw5nur)aVpKJGpcUr&}03RM4w_ixZZ9Q3uc% z6ylIf4`XM9W=56Lru7r(aZ|vg`qI3{8KKOg!y_{bqRvUDMddTR*nMQOM2_TYtO&_Z zBLSSONz%Hs^Gilh+J%(W_~QzbM+6H|>ZN4|TavylZVWFwgxC{zpIr_(;*fJrNy;WE zPI%<(-D9fDuqWgbE@b@_E-nRr#W>ee=!R8p*^qZc{5Wa#YEJ0y$md?xeo(fOz#otW BM85z4 delta 359 zcmWNM*(*eG6vsa@(pclVW9&m z^6dL^I_LZCyPT)yyXNOFPu}W&{N=kT%^K12@f*o={CKd*#YZtkRB6^yN+acjsGyBX zx`Yl=%_ucYiJhaK1OX0dGB^3_c1R8_WYQ{+cIi8$bxf+2Eb128gGHD!dZp}>s-GYO z=G7YW4&h~(97fEK<=SI%87G|yX{Llm)M?s83*G`QsmzeUteocLG*1HyN{rIUqT0>N ze@X3@O`ZMc#K>YzpTyO2U7Zq2-VnQq%N8qai`miK<$yg-IO0s(g}!;>_|x^(r36kX o5g6heM?{!QhPYyqYen4<(;XMT#jSZSOnUFh=0R^inxH@W4 Date: Tue, 14 Apr 2026 17:45:09 +0500 Subject: [PATCH 5/6] Delete .idea directory --- .idea/.gitignore | 5 ----- .idea/misc.xml | 6 ------ .idea/modules.xml | 8 -------- .idea/vcs.xml | 6 ------ ...0\265\320\274\320\265\321\201\321\202\321\200.iml" | 11 ----------- 5 files changed, 36 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/vcs.xml delete mode 100644 ".idea/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200.iml" diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index b58b603..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index f5bd2df..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 514065c..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git "a/.idea/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200.iml" "b/.idea/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200.iml" deleted file mode 100644 index 8df936b..0000000 --- "a/.idea/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200.iml" +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file From c0cb1bed2ad26e065f6cf6bfe53dedf92ff813d2 Mon Sep 17 00:00:00 2001 From: Alla509 Date: Tue, 14 Apr 2026 17:45:27 +0500 Subject: [PATCH 6/6] =?UTF-8?q?Delete=20out/production/=D0=BE=D0=BE=D0=BF?= =?UTF-8?q?=204=20=D1=81=D0=B5=D0=BC=D0=B5=D1=81=D1=82=D1=80=20directory?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gui/GameVisualizer$1.class" | Bin 701 -> 0 bytes .../gui/GameVisualizer$2.class" | Bin 706 -> 0 bytes .../gui/GameVisualizer$3.class" | Bin 929 -> 0 bytes .../gui/GameVisualizer.class" | Bin 5627 -> 0 bytes .../gui/GameWindow.class" | Bin 856 -> 0 bytes .../gui/LogWindow.class" | Bin 2580 -> 0 bytes .../gui/MainApplicationFrame$1.class" | Bin 837 -> 0 bytes .../gui/MainApplicationFrame.class" | Bin 6286 -> 0 bytes .../gui/MenuBarFactory.class" | Bin 4267 -> 0 bytes .../gui/RobotsProgram.class" | Bin 5419 -> 0 bytes .../log/LogChangeListener.class" | Bin 148 -> 0 bytes .../log/LogEntry.class" | Bin 651 -> 0 bytes .../log/LogLevel.class" | Bin 1390 -> 0 bytes .../log/LogWindowSource.class" | Bin 2507 -> 0 bytes .../log/Logger.class" | Bin 858 -> 0 bytes 15 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 "out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/GameVisualizer$1.class" delete mode 100644 "out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/GameVisualizer$2.class" delete mode 100644 "out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/GameVisualizer$3.class" delete mode 100644 "out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/GameVisualizer.class" delete mode 100644 "out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/GameWindow.class" delete mode 100644 "out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/LogWindow.class" delete mode 100644 "out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/MainApplicationFrame$1.class" delete mode 100644 "out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/MainApplicationFrame.class" delete mode 100644 "out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/MenuBarFactory.class" delete mode 100644 "out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/RobotsProgram.class" delete mode 100644 "out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/log/LogChangeListener.class" delete mode 100644 "out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/log/LogEntry.class" delete mode 100644 "out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/log/LogLevel.class" delete mode 100644 "out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/log/LogWindowSource.class" delete mode 100644 "out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/log/Logger.class" diff --git "a/out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/GameVisualizer$1.class" "b/out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/GameVisualizer$1.class" deleted file mode 100644 index 3f0bf76a0961dae8407aef10125e84e62b8f361e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 701 zcmZuv%Wl&^6g|_pacbPyd64pclmJPJ2;Hy=ViSdj6hZ}6P?wWrlunt9#f)7fR{RnY zFR|bQ_$b63CsKt{OTOpM@tHIC-tnKmzkUN4;BJ5o6nuCgHc@1#obXfL%~GkluO}yB znp%dk5g#&X#3<3DOeuzYtzj-xT+dgsUVEL|LJ3^|oUF_t#tN`4Zi zxzA8ckELxsqVL0XK`%fVk&ie;1yzRHS$T(YAocz(*nOIFTxpTJk-2j?Wz5duRUq{q-Bb0QUlHpy0y`v56u><%pm1Zk9^beKR={ z)6_DQjrf>JBSwiHWlAyJZw+&q;(ET4_1f#y7E0Li5rnvakfA=$WcMXsh_SR8SMrlE z&0U6KdMIu45q%%73wi;{hT>O#?uTm_6QS9Ox#l}*K>$pKHAj&NnZc@HUvd=MzcTlD1yq^-f&85y)_}@`G qGj-Pucnlv;a^rBRTN!&)wX5?s?htx(k`eCaOdUIdj0`l=XydVo7~%#J7FLjC$er;E-UtKfG>-ab zVh|{Xv@hO=(idIN?S_uSuwCgyFo(ON8LU}dOsyh?RRgAlE3g>WMxkuHvKDg4GnAsb{6o+X7s3r1hhC_}^C3SEgiloa(v`t8 zhIpmgGqHwi1_~C|ah+jf*`IAq!jKw?;MkKo%vWX?(KVtRNhqRZ;D&{p*d)ZFN@|-D z!3p;x9wh_mxeWHKOP5SqR1sSiZtJ@kzBuPm(e=u*t5Jxg@3~P z4rTHkZ@`@%_oY71k_p{PhQboI@?Mi6dnkfaZ+OgongVrOkf?JpTX%YZ5 siD@5sJe{j!|E*)Ajt4}Vz(c~uu!9Eq1noiwyHTcyN90Yyq{!3r2b$~E`2YX_ diff --git "a/out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/GameVisualizer.class" "b/out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/GameVisualizer.class" deleted file mode 100644 index 5acf845665e412303baf88e4e2d4048153188b49..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5627 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 R4zEurQK|hY`G1LyzX5u_tabnZ diff --git "a/out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/MainApplicationFrame$1.class" "b/out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/gui/MainApplicationFrame$1.class" deleted file mode 100644 index 3ada3302b64607b3fa3def5bb1e7a53f885bc5a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 837 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 diff --git "a/out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/log/LogEntry.class" "b/out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/log/LogEntry.class" deleted file mode 100644 index 1fb6da68d1578b4a45fea5aa2fc9882575fd4c0f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 651 zcmZuu%TB^j5IwgP3Z+0r@coP%sK$N(#*M*M)dhyc6)AXAOG=xxg~Y$oL}KE?5AdUm z(@P@=rpdfI=bV|jU*8{}0NOZIAt9qc){sSxK_A)^+w^STG4J|AK8P7|7q0KdmkgOk zvs*wO1qG^xA~Xig3mnr5oVFi_&ySP_^c4oj7!TriYE(Iz z!BEErWki5Yl3^m+q8^FjZS15nCi&!F)_8;RLV<*YJSU2}Ak=0JDIvoy_NbD~xCkyS MgX{l-_l3m44|QaCiU0rr diff --git "a/out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/log/LogLevel.class" "b/out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/log/LogLevel.class" deleted file mode 100644 index 0094a3418dec4101da550e71f1da65e73f6b643d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1390 zcmZux-*XdH6#j1ZXO`PG4YXJ&SPN_hvQ^HKG&AR(V=e2(ivmYL%~VZK)XA6;zh$Z2op56RSAC&}V( zhWmSQu@mj3w5-0NWc@hn3e`^Di_+bwNF-2Lt44A|8Bvm(11e`^KdHNn z`vTXQuSIQ@Ql4Oh#XoT71fzfD(M^7=E1= zJx1XxY*4$w<1p+;fpS@3nPhh;ZMt;h((*IB+c@_->c3JSr<d>5_bI&PKK{j>EjOClYBq%BISAT z7qeAAw5(^i{1leauGqHGJfnT=I7SPM_KE8nZN_Lvnr z5YQ0R5kgp?{g$z2j1&#KFmiSAmbv5!gwI*F<&6mhlBwBdM9{1us-p$EKxfe@jO3ld zoMkUNccz_+yJQONDJ@vnDrUvZn|8rl5fC{Idw5$JuXt8*v^l}MbV0O>3pw1 zFqx}*=+v{b4Ldh(bje=Pg=*sW%JS*P^B&r@AG5MyYv{0m7(>C3*JdEo&h(kng zEHBeYvTCIv!ffige1BL+9})t4OAE%5XRVnMow6d(b0hBuI=;fx)Q^<+qdJaB2VvJN zIcuhd;{v*WeZuzK^(gw0lp&@BjwWlC^5&XZ%r>Bz_FT&@WK**m1_*Rlhccic9m5zA z&^$+FQ6QPT(O{>_TQ;@Jo`ysV(m1K(9Z9zC*yOGn(y}ytTE{5PkchJNHF+fAxhT#e zqamx~9L^KgHV5NQu}Fbfj!kl!&C;r;2o>l^rW&Y{X=I+>!vzf&b-a&p3S?VllZF&X zpk&zsp=2&6J+@*($7OuL7|WGKX+U6~JlkoOey6R1ZFm)zaQhpM>-suZ%eSH;JC+p~ z{>OVe7?ux$S$xYxuT_ZcNq-F&oMPHTz-L=qmToY)W_Kc<5lg6roq+zaBdrI~*E3R|L z51?Yd=|60&u9`NBCBg`lOvzZyS5>ww&9diCR%=t{VVh82#$?l!;%|6bWq^5nqrO6} ztSZ*oHpvQUj(L$lnYQM#XSm*F*D2BRl2fs%35{LHygTE_3aG2&wTHW~A25nVf&Dd& zzIL5{j_-P~i=Ak-+g-M#5caW-8hIX;`9OkgrHO4e$X~Wg&YEOjgTNIv&!I#1tor&x zRtI|!&ou6_CGz(pu1sYCNTjzQ((w&w=_hENk8h!E108C)@F{#cZs05~Pm7|<}OmOVdxQ0)Bm){X;kY|1AN9dlP{7nu6n>a9+78~dt ze10F1sln$%&mQughHiQQ{|~7#fNcbQJUxPT93_HdILuDCji9fNpbyiSq32I&r3X!~ zXolaUh=#OA`$EI)UqmDD*}vgC@?Y_#h;M-S28nNo_=f)%zImjo`4d^63R>ligY>N#U+)PF@(9NDY_yuygG&J zxQ-hPUhaL4FX%lA2VY`=USqh)zXVev3GPGaCB`-MYdArACltHdOSEt;#Gm9|$gfZ} zk;Ey52}ET2HgW1l&YP6L!fOAD!X@R)J3bl#1B<*RYv)_~mqH$he~&$J-^dTp9^>5y z@q;)0jmH=plhgR2O(x|ssHc-?W2JO5AqnbF>Nj0ASr2{yOR9qC2Fsi^@n)1| wtJ97QnGK*V;1~T@gj&Fg4{wAk2|XmeOUI3|%{9ap@|{&Xhs8&?)a~1U11cX3BLDyZ diff --git "a/out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/log/Logger.class" "b/out/production/\320\276\320\276\320\277 4 \321\201\320\265\320\274\320\265\321\201\321\202\321\200/log/Logger.class" deleted file mode 100644 index 75ec665673e220b88222947353b42c43bb9971a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 858 zcmZ`%&2G~`7@SR0l4BqRfeqEs9=@nT#VyK5OE0ZM}p_I~62=9`(_A3wi-2XKI03l&sN7&dB{6KEgHQ`w7T9Q0ldkJTs> znA;2EFnc0Ub=*M%bu>&^Hkz;ntSAY3UJ?WG#=`^kp_ z?l;iFf{C_`MJx%}bWE(;Si=>8eN8usQw8GmUu&z&)s~T%w2O>9FJ>pkr zw0jQmiHiz0`PMfFY%thziz~a>gxlC+)xaHWmjsVd&HpveV4h*V`vuGY(zHpp_!mtR zJGh(EIRBx!I*X=5n$?*!F1n?fja&<0P|Zh<5V;#|77U<{d%uml)UBWSZ&-QL_Rq2L V8KzcVv=jlDG+rlipLhiiegTC7p$Py0