From 475de5268b9fa1491c34c2e77e00eb648998ab87 Mon Sep 17 00:00:00 2001 From: esoe Date: Tue, 17 May 2022 12:44:36 +0300 Subject: [PATCH] qqq --- src/main/java/ru/egspt/TagModel.java | 9 +++++++++ src/main/java/ru/egspt/TagPane.java | 1 + src/main/java/ru/egspt/UserListModel.java | 6 +++++- target/classes/ru/egspt/TagModel.class | Bin 1791 -> 2129 bytes target/classes/ru/egspt/TagPane.class | Bin 3594 -> 3594 bytes target/classes/ru/egspt/UserListModel.class | Bin 3388 -> 3630 bytes 6 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main/java/ru/egspt/TagModel.java b/src/main/java/ru/egspt/TagModel.java index 7a64663..2a3f63f 100644 --- a/src/main/java/ru/egspt/TagModel.java +++ b/src/main/java/ru/egspt/TagModel.java @@ -49,4 +49,13 @@ public class TagModel { } setTags(newTags); } + public String[] toArray(ArrayList tags){ + String[] s = new String[tags.size()]; + int i = 0; + while (i < tags.size()){ + s[i] = tags.get(i); + i++; + } + return s; + } } diff --git a/src/main/java/ru/egspt/TagPane.java b/src/main/java/ru/egspt/TagPane.java index 03c5760..d55bc0b 100644 --- a/src/main/java/ru/egspt/TagPane.java +++ b/src/main/java/ru/egspt/TagPane.java @@ -30,6 +30,7 @@ public class TagPane extends JPanel{ i++; } this.add(tagArea); + //рамки вокруг панельки TitledBorder border = new TitledBorder(new LineBorder(Color.black), "tag-controls", TitledBorder.CENTER, TitledBorder.CENTER); this.setBorder(border); } diff --git a/src/main/java/ru/egspt/UserListModel.java b/src/main/java/ru/egspt/UserListModel.java index 6979625..323bcd5 100644 --- a/src/main/java/ru/egspt/UserListModel.java +++ b/src/main/java/ru/egspt/UserListModel.java @@ -21,6 +21,10 @@ public class UserListModel { } //берем список пользователей из базы (сразу после подключения к базе данных) public void setUsersFromBase(Base base){ + ArrayList us = getUsersFromBase(base); + setUsers(us); + } + public ArrayList getUsersFromBase(Base base){ ArrayList us = new ArrayList<>(); String querry = "SELECT id, username, email FROM mdl_user"; ResultSet rs = base.querry(querry); @@ -38,7 +42,7 @@ public class UserListModel { ex.printStackTrace(); System.out.println (ex); } - setUsers(us); + return us; } //вывод пользователей в консоль public void getUsersToConsole(ArrayList ul){ diff --git a/target/classes/ru/egspt/TagModel.class b/target/classes/ru/egspt/TagModel.class index af2be13d1990a8223e1e311a19789f354f1791bb..07ba47492c79f43a9d82f1d367d962148ed9cf02 100644 GIT binary patch delta 323 zcmZvWK}!N*5Qd-c+s&0P7Yf}FVuOf&rHUvSu*2zPq73@ihFxW)!)Wts_{(??k zi@+c#I(O@b^b^Xayvo4LJM+Hp%*@=+74z})@&=T-cr@D1IK7*ClEec=VS7~f@;mLr ztGFMRuH$Z})a)gf-A+|e6D~Izc)N>fb*soOFgmox#*S3#sbN3syJIwt+}511EOmk{ z0YNw=d?h%tY7JO```-l9rQ zG==$MJl3R>6D-k4p~U2KN=tq)VklF=k_s8&=CZV)NU%YF<2tmJE0Z&sXwH8D!ks#? delta 36 scmca8@Sm6K)W2Q(7#J8#7$P=uF|kZu$YRFGy7>mnb|zK^1}27Z0Pd6up8x;= diff --git a/target/classes/ru/egspt/TagPane.class b/target/classes/ru/egspt/TagPane.class index cd15688c2c3c74ac0eada65c8c3be399ecd38a8f..e4acfafbda501b8efcd15dede4e44d003ebb965a 100644 GIT binary patch delta 73 zcmeB@>5|znjhj=6;R=H?!%YU2$@95O7&Rx0@YpcwPY&d%ku_rAWH4snW-wvkV=!gV cXE0+h0iDk5#?7@2o0BJxEyZ`_I delta 73 zcmeB@>5|znjhj=E;R=Hi!%YU|$@95O7&Rt~@YpcwO%CL#ku_xCWH4gjW-w;pV=!UR cXD|iwj2Ubh%o$u5EGEC=iDk5%?7@2o0B2ket^fc4 diff --git a/target/classes/ru/egspt/UserListModel.class b/target/classes/ru/egspt/UserListModel.class index 7e435d329e7033b624ac2578fd772c0a0cb245a4..55b0aa83c1d51c5a533d0a25fab2cced00c243b5 100644 GIT binary patch delta 1625 zcmZWp=~Giz96k5ty}UEgq;3J@HCV^_VbfJs2 zwbk2AYZtrGO{&%jwRAe2PCs&}`3l~rxA>5vtTPbEUOMYiaLnw?W| zTC2!y{J*zA9uRJafq*oWU`Y@m9d`??_*W4V_h7Butu$2C2`Hlnvr&&m9Ss8RLy?(C zD1Kxt)M3S^#}b`Z!o}I2JA&jjivd}8GI6}_tCLX{JdCcLjuSc7ScI*^TC#<6h0Y}xEeOcIz4jm7Xj`T2N zk%?%i^H@A#jhpC1m%QfiiyrxhW3Y5D_UY&q$WI53PKI{JMkf-TiI^2(Y#;W^m|E@} zzyTc(%X4Z`C<2$j9aEX8$k5@gSY*hu8xEN`h%OE=Ih}A}FNW>(s7yKv*{V!CE)w#B zwnlwKpirK47P?%>!7&q$;xTz$^Si@%!bBYoyAVgx#8Y@$2A$=;89Zy_-f!SJLiF?F z!VF$8@gk1Pap!tp7$;1OVI+$by<%b6CSJoS`LnaqDNVeNH{_qrYb{}%Gx07? z@enAJw#n$|gbVNEyp9h9@|MrHD-vy=JZO!X_z*<`I%8>y>-bnM=_N)SpPHD%XL6Ns zLg?Sj8@fmmx&j9^X;ueP@V8gjq)>i|dk6CQ%t`x-;Di_1D8@?K{F!)oP{18CQHj-5 zrIX(({uJDqw%)QBvheK!60g*6;=ARS|rGBI=9|AQQwoj^mFy<6ok`JA(tBO`PJGoyp!k_j}Iye$V&rep~xvjq~fx zAASPvQ-l ziw706N@NDp*}i1Q(Oljea(S4odcusUHhtRMAKK1NiyiuwSsmC#yRHe=4Rq3Fv0E|c zcJAgQ8E+)tKb&>hgQK`(WUN1%@5rY!hdam88P9Ln?Xr)pLST42@35UmU3Sr{h}5^; zF0^C+fS1XyZs>AQJg#>di}i)zF*U3cp$2nIF;7=o^BjjtWN70|=%+)ma0^FV8aU{X zv3}ps!fBWHIU)Y^dHJ^CzW%JkSw6J*KrwsT`p$IUw&4Tbpvy;8 zD=fiEC};7BF4*(!EazO#^O-(xA6KF8nkp<+P+5XP6DFpp?7qgVZQe>U zUSV_iks{lo!6F@3*z4bWmNgc6tZ-Q-9j1$JIx(3eM7A(n{;RQxGJ_h~ttG+&V%#Z5 z@-CWXwV8#qNxX|il37O&i^<5DKg3c-#Efy4F;}V_#POv`ewEz))f1$pqb*+TCxlUu z7KbG7M)ds8ezU5EJ5fxx4N)*iqYTynXTyaeFWip4 zEKmOn9g|Rz*JQAhhN_JhdE?xztCyu}d5|^28WPf}Nf;*O)mkn?Ymz~)C=DkjnqfD3 z%5~PC60m$K=-_P;ZcGdE0jET&DhaB<_?w`*Atos_@BFL6;9VV@xwPQ(FY=xkdnRI* z