From b73e076b76ee96eed91ce5b20c6da29977bffd72 Mon Sep 17 00:00:00 2001 From: Strantonvad Date: Thu, 20 Feb 2020 22:49:38 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=BC=D0=B0=D1=88=D0=BD=D0=B5?= =?UTF-8?q?=D0=B5=20=D0=B7=D0=B0=D0=B4=D0=B0=D0=BD=D0=B8=D0=B5=20=E2=84=96?= =?UTF-8?q?2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 5 +- .idea/dataSources.xml | 19 +++-- ..._junit_jupiter_junit_jupiter_5_6_0_RC1.xml | 13 ---- ...it_jupiter_junit_jupiter_api_5_6_0_RC1.xml | 13 ---- ...jupiter_junit_jupiter_engine_5_6_0_RC1.xml | 13 ---- ...tform_junit_platform_commons_1_6_0_RC1.xml | 13 ---- ...atform_junit_platform_engine_1_6_0_RC1.xml | 13 ---- homework.db | Bin 40960 -> 40960 bytes task2/src/main/java/DBUtility.java | 66 ++++++++++++++---- task2/src/test/java/DBTests.java | 10 +-- task2/target/classes/A.class | Bin 0 -> 480 bytes task2/target/classes/DBUtility.class | Bin 2418 -> 4327 bytes task2/target/classes/classWork/Ex1.class | Bin 0 -> 2094 bytes task2/target/classes/classWork/Ex2.class | Bin 0 -> 1235 bytes task2/target/classes/classWork/Wow.class | Bin 0 -> 494 bytes task2/target/test-classes/DBTests.class | Bin 4138 -> 4161 bytes .../target/test-classes/HomeWorkLesson2.class | Bin 911 -> 915 bytes task3/task3.iml | 10 +-- task4/task4.iml | 10 +-- 19 files changed, 86 insertions(+), 99 deletions(-) delete mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_6_0_RC1.xml delete mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_0_RC1.xml delete mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_6_0_RC1.xml delete mode 100644 .idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_0_RC1.xml delete mode 100644 .idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_6_0_RC1.xml create mode 100644 task2/target/classes/A.class create mode 100644 task2/target/classes/classWork/Ex1.class create mode 100644 task2/target/classes/classWork/Ex2.class create mode 100644 task2/target/classes/classWork/Wow.class diff --git a/.gitignore b/.gitignore index 21b4487..a97d5a0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ # Project exclude paths -/out/ \ No newline at end of file +/out/ +/.idea/ +/tmpDB.db +/target/ \ No newline at end of file diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index 70c42e6..fa6975e 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -5,7 +5,7 @@ sqlite.xerial true org.sqlite.JDBC - jdbc:sqlite:C:\Users\Mikhail\IdeaProjects\Java3\homework.db + jdbc:sqlite:C:\Geekbrains\Java3\homework.db file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.25.1/license.txt @@ -20,9 +20,6 @@ true org.sqlite.JDBC jdbc:sqlite:$PROJECT_DIR$/tmpDB.db - - - sqlite.xerial @@ -44,5 +41,19 @@ org.sqlite.JDBC jdbc:sqlite:classwork.db + + sqlite.xerial + true + org.sqlite.JDBC + jdbc:sqlite:C:\Geekbrains\Java3\homework.db + + + file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.25.1/license.txt + + + file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.25.1/sqlite-jdbc-3.25.1.jar + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_6_0_RC1.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_6_0_RC1.xml deleted file mode 100644 index f8bf2aa..0000000 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_6_0_RC1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_0_RC1.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_0_RC1.xml deleted file mode 100644 index 4d72560..0000000 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_0_RC1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_6_0_RC1.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_6_0_RC1.xml deleted file mode 100644 index 1d54e61..0000000 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_6_0_RC1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_0_RC1.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_0_RC1.xml deleted file mode 100644 index a5016bb..0000000 --- a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_0_RC1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_6_0_RC1.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_6_0_RC1.xml deleted file mode 100644 index a74d90f..0000000 --- a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_6_0_RC1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/homework.db b/homework.db index 255eaf10c54304da1b5b6b3e2e802fa267391f70..7b7b3f4218f4f316213b95e063769f122b92f354 100644 GIT binary patch delta 364 zcmZoTz|?SnX@az1D+2=q7ZAfh*F+s-`Bnx!69rzL)eM~6JDB)q^C|O|@t5(f;;ZF} z=H9_;zp>GZo2yYlgI!!&nz2cI@-ZG&mXg#Wg~_tKYNnxno`IpR3OWk8`6;P63JRWn zA+GMOK|p?DHc(B7Yea~SLUMjiK8#&bS&%w8kymtbG*18vZyv*x$?JJ0u<2^Di91S9 zuHl!ID9X$OnjUW$0AaB5l{0XFoV&S`I;`an7G-83+|e_-JM!~c!{ z1JL06{E9#!R%S*dxY$pfZE_rsFAHBe!|BQEc_x^<`h_U? z`2%sNkB^Q*ZhlH?j)G@iNosm(k&Z%geolUoLWpZbh>k)*QD$09Bx)t24rRGa2cQ; zDP#^p4^RdK7=f6D|Knyshx`1BKsGBYGb1AtGYc~(kYr}y)5S7BA%h0KgJ?_W%F@ diff --git a/task2/src/main/java/DBUtility.java b/task2/src/main/java/DBUtility.java index 0e67b06..dcc950d 100644 --- a/task2/src/main/java/DBUtility.java +++ b/task2/src/main/java/DBUtility.java @@ -18,22 +18,42 @@ public class DBUtility { */ - void AddPrinters(Statement stmt){ - // TODO: 16.12.2019 + void AddPrinters(Statement stmt) throws SQLException { + ArrayList printers = new ArrayList<>(); + Printer printer1 = new Printer(1012,"HP", "col", "laser", 20000); + Printer printer2 = new Printer(1010,"Canon", "bw", "jet", 5000); + Printer printer3 = new Printer(1010,"Canon", "bw", "jet", 5000); + printers.add(printer1); + printers.add(printer2); + printers.add(printer3); + + for (Printer printer : printers) { + stmt.addBatch("INSERT INTO Printer (model, maker, color, type, price) VALUES (" + printer.getModel() + + ", '" + printer.getMaker() + "', '" + printer.getColor() + "', '" + printer.getType() + + "', " + printer.getPrice() + ");"); + } + stmt.executeBatch(); } - public void createPrinterTable(Connection con, Statement stmt){ - // TODO: 16.12.2019 + public void createPrinterTable(Connection con, Statement stmt) throws SQLException { + stmt.execute("CREATE TABLE IF NOT EXISTS " + + "Printer (id INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE " + + ", model INTEGER, maker TEXT, color TEXT, type TEXT, price INTEGER)"); + AddPrinters(stmt); } /* * Метод должен вернуть список уникальных моделей PC дороже 15 тысяч */ - public ArrayList selectExpensivePC(Statement stmt){ - //todo - return null; + public ArrayList selectExpensivePC(Statement stmt) throws SQLException { + ArrayList models = new ArrayList<>(); + ResultSet rs = stmt.executeQuery("select distinct p.model from pc p where p.price > 15000"); + while (rs.next()) { + models.add(rs.getString("model")); + } + return models; } /* @@ -41,18 +61,27 @@ public ArrayList selectExpensivePC(Statement stmt){ * которых выше чем 2500 */ - public ArrayList selectQuickLaptop(Statement stmt) { - // TODO: 16.12.2019 - return null; + public ArrayList selectQuickLaptop(Statement stmt) throws SQLException { + ArrayList ids = new ArrayList<>(); + ResultSet rs = stmt.executeQuery("SELECT l.id from Laptop l where l.speed > 2500"); + while (rs.next()) { + ids.add(rs.getInt("id")); + } + return ids; } /* * Метод должен вернуть список производителей которые * делают и пк и ноутбуки */ - public ArrayList selectMaker(Statement stmt){ + public ArrayList selectMaker(Statement stmt) throws SQLException { ArrayList ans = new ArrayList<>(); - // TODO: 18.02.2020 + ResultSet rs = stmt.executeQuery("SELECT DISTINCT pr.maker from Product pr, (" + + "SELECT p.maker from Product p where p.type = 'PC' and p.type <> 'Laptop') p " + + "where pr.type = 'Laptop' and pr.maker = p.maker"); + while (rs.next()) { + ans.add(rs.getString("maker")); + } return ans; } @@ -65,9 +94,18 @@ public ArrayList selectMaker(Statement stmt){ * или сделать любым другим способом */ - public int makerWithMaxProceeds(Statement stmt){ + public int makerWithMaxProceeds(Statement stmt) throws SQLException { int result = 0; - //todo + ResultSet rs = stmt.executeQuery("select max(m.sum) summ from (select sum(m.price) sum, p.maker from " + + "(SELECT pc.price, pc.model from PC pc\n" + + "UNION ALL\n" + + "SELECT l.price, l.model from Laptop l) m,\n" + + "(SELECT p.* FROM Product p GROUP by p.model) p\n" + + "where m.model = p.model\n" + + "group by p.maker) m"); + while (rs.next()) { + result = rs.getInt("summ"); + } return result; } diff --git a/task2/src/test/java/DBTests.java b/task2/src/test/java/DBTests.java index 64d94e4..fc47c76 100644 --- a/task2/src/test/java/DBTests.java +++ b/task2/src/test/java/DBTests.java @@ -19,7 +19,7 @@ public void starter() { try { util = new DBUtility(); Class.forName("org.sqlite.JDBC"); - con = DriverManager.getConnection("jdbc:sqlite:C:\\Users\\Mikhail\\IdeaProjects\\Java31\\homework.db"); + con = DriverManager.getConnection("jdbc:sqlite:C:\\Geekbrains\\Java3\\homework.db"); stmt = con.createStatement(); } catch (ClassNotFoundException | SQLException e) { e.printStackTrace(); @@ -47,28 +47,28 @@ public void testTable() throws SQLException { } @Test - public void testExpensivePC(){ + public void testExpensivePC() throws SQLException { ArrayList list = util.selectExpensivePC(stmt); list.sort(Comparator.comparing(o->o)); Assert.assertArrayEquals(new String[]{"2205", "2210"}, list.toArray()); } @Test - public void testQuickLaptop(){ + public void testQuickLaptop() throws SQLException { ArrayList list = util.selectQuickLaptop(stmt); Collections.sort(list); Assert.assertArrayEquals(new Integer[]{3, 7}, list.toArray()); } @Test - public void testMaker(){ + public void testMaker() throws SQLException { ArrayList list = util.selectMaker(stmt); Collections.sort(list); Assert.assertArrayEquals(new String[]{"Intel"}, list.toArray()); } @Test - public void maxCostTest(){ + public void maxCostTest() throws SQLException { int max = util.makerWithMaxProceeds(stmt); Assert.assertEquals(140000, max); } diff --git a/task2/target/classes/A.class b/task2/target/classes/A.class new file mode 100644 index 0000000000000000000000000000000000000000..4bf1a1a8724f364936044ab45a2933a22befcf42 GIT binary patch literal 480 zcmZvYT}#4X7>4gxr<-%8Y4-hP5oiZ_(wS0-5ClWRndfs2du47hXVA~8gMtqF0sW}x z-jX2b9q+T}>$;z3`}}(U0C0|D9V*sxsA65ihK@~aY1me=qheP;*u2*Q*|zj$bRm$g zH%0)|H5_rg**9xktRqm0p{8g1lV*QB zb)D!>%6ghd?u?^@1q)R(X_i6rCX{|;MWJiYxKibxw1D~$H+ep}`VW{)Atn7ut1;p# zS^heJ-^3?JFGZj0(;AE}lNczRzCpYoRZhP`c~062v@1x{s!#|U#8(&@LlAT literal 0 HcmV?d00001 diff --git a/task2/target/classes/DBUtility.class b/task2/target/classes/DBUtility.class index 8e43b51e41a9b809fed8a6773ea51f641e270a78..b436bbff1a97ce33dcfe339817daf07a690308f3 100644 GIT binary patch literal 4327 zcmbVQ`*Ryt75-M1y&HKO$4cTnNpI3nOSWt$X-gqaoZ5<#h|02K$#ImYjRapgm{R6tt&~ zk4)ND!Lk z*+pBymi4?8Xr2!PZ*?u|+;?EOS~V6^R?TLBhRMMd@z9ERkAkk%NERy%G-ADoNBrD| z82k=G$Xy&YDh>e-htIGL*a0fOsUVbC$e9(}Dwk?1zD3e~D zoHI?C+HLwiNy4iRu?iGULYZ>Cnln#W@{Dctk5RuoGdk|Uy$Uuv=Vx`F^YnO4#k!pu zceFk*Bb`%k(V`9Pq9uv88p6a<9S@;N$+;#7jR9-i&D`-g^r)%Dszqw>i8M1sdz@m&+!W#OSrD! z$@oNKIGYgJ;gM8ABu|L+SXLy?CNtU0N_JLWrkgmKm=NO=$d^Gka@C%=ZOx+hDTJ#FR`rSFxX=EyZs^Zyo#(+ z&K8w^H~#r*xhN_*Q4yEs%&JMf8)Qfvyzjt)13F&94W1lXkISr_$UBXe>mE{k3{AD)=e7*+jfWYPje%94BnP=A?ZjIoF2Ex#nt&$EgUh z5604BIF$PvGDzdT2LddOn z(F^CGl}n-7YPnwVY$bfgmd_t?@&fg50tK5^PUqOn1zz@iR~*%EfJe~4ir-reN;9v6!1|!L}SNfaLB%O!K$mhACcgs4riJR|W^c){x%g?DR()^q> za^>++=Zsp~Tp&RH7@<$F?kvCs_-CQtp zb=&mJf|2M$Oj7lHwwmrh^#5Ww5` zZF7`uxSz7_8sP1C2WOCXGOg&WJkMYnHLu=4VEQ^*MsFZE-P!WbaBH|Ntahfwb!cf< z_mA*~a46i~x%pA*4hPp$w#NFFpijki1l^(48J2Lz;kF%Z%h;&kY0OEfL%}Nu9#(sA zU=z3P42PGnd55}$Elb!M?(!zvIEJ@-lO4^IopQ3vTiGpr-onWe_AKMh0IuA8s&^Se z!IY#U=+H5Q4$55wyA8Xsom}p~3G74)yO5#g9QI%ycj5^MER*X$Q2rD4;m^1Wf5Co- z##1C~9%pa_M=6mspU_t^gkvOGqx}OICb_$D10%F+;ZBzkrxfIVkK;I{RwU>xi{jd! zp#4c|_9Ac-4?|UPN<~t|J5@Z`_?H6yjS@y_7NldE|Hm-yRuPjNTe#8@3-4XVz5u3r zVoSJdr5QFl%MolqFE%3Ppb@T%kD&vnF~P75dMW(#a^JjTZb;92fJ5e|8_FoPFAOfImkBcapU?K z#e7!x6QX3blhrzdDQ2+3pjPqH!!fXeBf1(# z7jg6~qc^}`GUQW2`Rf`e!-O)z#Nvc<9DOYE3X}mK%77208}Ig@>{$avuDxd+D7)4` zc`u_b_nB&@})CFy_NlB9`aj5sEUBg0ZmHsOf*IGRghyiQ4s|Dhx^$Pu$_t;aaZ z*4o!{v^PAk8bL>2_<&Q3qgQVJefL#bwKxacZKxS~=FpA{*n*2Z!o{ZS_xaiH^QsV_ iMII)7+Ibzg4J8jC|03}k+7%VkTbdYGaGq-c%>EZlfkdIW zC6KIH9Vsy0FihEU`#aL!&~|#X7(WuPq!skhd^PxQVgtSnWoeo z!!j#JA$SoIx@8KSIhc<52uuuRj{qyX18EM8CvvSOFdGXH%Qir8NpXJJwza*6F?7gu ztZj5n&2eq&v-I|!Hv_nyW_BqFmFiX&i5BLw?i%{zhBk1lfxxZ*hgzrjU1|HU*??wK zdn|1M#j8n7@_TaV_MEo#=m^r7IuNV9-dNey<-nJiVrnK`Lop9YarX80*c-fRk>XL> z9izYrO0GX{Y6HLAZ0i&nY+WYY_p;wMoQF+qcg?nRDLcpaR-IjK`@G00X!NE)rfs>l zF7Fy%H=m3ew(NCh4im@=O!}SrIyZqqAfW2!P*QcvHJyS#D5}~p7)x9I&bIn$rVuW^ zQ*Uq7TeS`KaxgKlt&XcZMYU^N?m*qy3*gj;+7s440$Hr8SGb>>Ikd1!_BpI!U0}oy zm%}}@bJ)Np>u|8CVr9x^z&S9wf$5MWf<}ry8XhyHgxH) z_T1i})M3*brtYXlr}Rn;-yvAHR#P8YhN-eV9#hpa)q!5_^Em0LRW;-vj5C|9`f4i^ zO7$PO!B#kg9hi^CFRGc>WiGP26BHnaZQSR+jjAtj$`{h#i>o`2cpmWRiL{M&N8A{l z3j#U0D|OeA>#nr-1PbA9jqmKR|GnccLSr^bQ|>Yp58ZE>Pggp@K_GDHc#Jr#w;wwl z_Cb7kK%nA5jte#QUYd!w7laCpntuQ}8)* z`31z!{G;GB@1wqP6leH97c9V8OmPI9!+Baf=c~LFUWXi~e8;oFWaKFD4&J4!z%OnU<#iq$tiw5*EsU>QN%Ov9%FJbmXH#mDPckv{M8@Q z`{G+*mEQvEBVt{Ou>K&6Bx5Z63gy8IB$~7NS zAEUtdWqKF6&J%kfQeYueAdM1cc_~B*DjrzMw9L~oiR9myNa2$dKK%>lZl`c1i38a_ zBV^DLKhnXYI+Li*=5ry*{E2;>R8W0IYWgRx_R2FwQVE~b4Eqvj(z=Q)Hfg)h*)2BP zHoN6PL@0}~kkGjpp_z!#Oh`zf*HwxXq<_9(%fiD(X5|*Rw>z zaVKSFS4`JZ^Fz?@ZCV9ooywYp!m8tL56AXK#z~ViEnA>7vKHSmcg^9fX=jF$o@?2e z@$xpNo1tU-Da&+DIX0coRa^@@+2JVyGUZv0t+)$b&J*aUEhjzGlR0U7T=nJ2+f!Rx zaAn?fW%`(nOPf0XC0QtDy`)tBEi_DR&zt#jh#D?y_*}z%4G%P!0-@MmO6Ju`3L4fm zqzEOQqMMR4mXayR_=i-;I$pu6l*Vy0Lkz+4u`Mhqs<^70@;uH$goGE=5jhi8`pf7Ynho z%02B`yV9LEZ8M_;Y{^Kk)(`^GmlGaWhNN{GCie?$8uq_itW;w$PY*LS{D$N`n zDheNm84XLv_Ohx;>o>2YrQG1Hm6EJWKxZUc>&hyw&XljTXcZH`Tw1(<-r~Ow%ns~yf;Y`F!On7 zrv(OIPEdCV9(Ds+0?g)|O&)(_F3J=4aHy+>%1LYHO*F4yDx_0PNg4Egg0@C zBy<*6;YTB}pToXqXjl#VpP@1SI|BU&(E3XV3e5M1n@R}zkQgkXSzvV_te4Q@Qy*ta zX!T*t-{mi%P2d;I(DhH8z55j5aQgu|y8K)@=feRy!{^KM#u6^5dB@>Aa5O(a*8#eJ zeSV-qXn?`@7|!tB#85&AqM2dnXh$2m`Je3NS06fYjloPXoLO9kg$SN-{D~_n?9obS zc#D`4;StxPl%g9uwCJY(=e*xZQvio S@eU0Fbbc4_k?eiWsKI|p^c2GY literal 0 HcmV?d00001 diff --git a/task2/target/classes/classWork/Ex2.class b/task2/target/classes/classWork/Ex2.class new file mode 100644 index 0000000000000000000000000000000000000000..b35ec74319d2c2d96b2dfe482bbabdad74d662a0 GIT binary patch literal 1235 zcmZ`&+g8(15Z&RHQo_Y@Q4#f^7F(#TfL97?DZy1t3(|1YzNG1)4YUcKq`-qe<&)rp zAK*v1oD^tLAzAB8=C)^_naQu;KYjvuhExy=#shc|#6vs^ARNR59`_)EXaJKvm_jUo zC%%l!NXU39p=;i$!Hmio~ZaHEtuCU>9;TE#ie#Nk= zg-nSXYr@$hT5e&5@MfnA6{p6Js0r~>QN{}eFY!voYXx&4VqeqiYD!m`o?6sYmRV-G zRh_BZnY^B7Yt$Hzi-=WXnVhb^SJ&CvdM2A%-(err9hTbAS2H=v&#F1Sk(b-hv>2<= ztg0+Ssbwx=%yg=bV7j`k$Jl|eOnw0tP0E;8umBo!cuCb%qOmKS+C^PRGw?Z8!=+vf8(Ip`p z3(2Plv|%e2>OMt~K3eFbgbxJi^hqg%+lw(e!-VZuWM`-t!A;T>jN%q<6N^E5M{$R$ Sj*-2K~lM z+Y9EpRxg^yo_{Hoib?6yv3L|VEG*eDQQ+9Iv5P$h?snC3IreQF;E zt!AJ4G3Y}9nn86QvP9#}|CtwaGBQtI z%-b&O&A`CG!obMD%isuPu>n~=K$?*uh{243d9p2E3r-awU=>&Rs&J|Z1*=HpkKlyc JGIQvP5IU&F`2Ob22hbp2XWO?8v~tz{bGH-~*%?8G;zh7?>uT@wK3dhk(Ve^HrgV Phl0iP_#-A?;4cIKPiiC6 diff --git a/task2/target/test-classes/HomeWorkLesson2.class b/task2/target/test-classes/HomeWorkLesson2.class index e372c080c3472e267fdd3d1a725e29712f359eb2..29cb2c3b85a5e445ce6774571d2b6a24bd185511 100644 GIT binary patch delta 29 lcmeBYpUl2t9uwoM$@7^~n4K5|CbKbHGFvc+OtxbV1OSFs2ciG~ delta 25 hcmbQt-p{^a9uwoU$@7^~nC%$&C$lkIPIhJv003(@2TlM0 diff --git a/task3/task3.iml b/task3/task3.iml index 2a3c5ba..2b9ae0b 100644 --- a/task3/task3.iml +++ b/task3/task3.iml @@ -13,12 +13,12 @@ - - + + - - - + + + diff --git a/task4/task4.iml b/task4/task4.iml index 2394831..d140331 100644 --- a/task4/task4.iml +++ b/task4/task4.iml @@ -11,12 +11,12 @@ - - + + - - - + + +