From 7fb5ba8c39585193e4e08de9bb1d64889d2f5dfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=95=D0=B3=D0=BE=D1=80=20=D0=9F=D1=8B=D0=B6=D0=BE=D0=B2?=
 <pizhovegor@gmail.com>
Date: Tue, 27 Feb 2024 13:59:00 +0400
Subject: [PATCH] final

---
 ProjectCatamaran/src/DrawningCatamaran.java   |  23 +++++++-----------
 .../src/DrawningCatamaranPaddle.java          |  22 ++++-------------
 ProjectCatamaran/src/FormCatamaran.java       |   2 +-
 ProjectCatamaran/src/Main.java                |   2 +-
 ProjectCatamaran/src/PaddlesCount.java        |  10 ++++++--
 .../DrawningCatamaran$1.class                 | Bin 725 -> 725 bytes
 .../ProjectCatamaran/DrawningCatamaran.class  | Bin 5647 -> 5636 bytes
 .../DrawningCatamaranPaddle.class             | Bin 1780 -> 1543 bytes
 .../ProjectCatamaran/FormCatamaran.class      | Bin 4170 -> 4204 bytes
 .../ProjectCatamaran/PaddlesCount.class       | Bin 1143 -> 1243 bytes
 10 files changed, 24 insertions(+), 35 deletions(-)

diff --git a/ProjectCatamaran/src/DrawningCatamaran.java b/ProjectCatamaran/src/DrawningCatamaran.java
index 5a96ee9..c037630 100644
--- a/ProjectCatamaran/src/DrawningCatamaran.java
+++ b/ProjectCatamaran/src/DrawningCatamaran.java
@@ -2,19 +2,17 @@ import java.awt.*;
 import java.util.Random;
 
 public class DrawningCatamaran {
-    public EntityCatamaran entityCatamaran;
+    private EntityCatamaran entityCatamaran;
+    public EntityCatamaran getEntityCatamaran() {
+        return entityCatamaran;
+    }
     private Integer _pictureWidth;
     private Integer _pictureHeight;
     private Integer _startPosX;
     private Integer _startPosY;
     private final int _drawingCatamaranWidth = 120;
     private final int _drawingCatamaranHeight = 70;
-    private DrawningCatamaranPaddle _drawingCatamaranPaddle;
-
-    public EntityCatamaran EntityCatamaran() {
-        return entityCatamaran;
-    }
-
+    public DrawningCatamaranPaddle _drawingCatamaranPaddle;
 
     public void Init(int speed, float weight, Color bodyColor, Color additionalColor, boolean floaters, boolean sail) {
         entityCatamaran = new EntityCatamaran();
@@ -24,7 +22,7 @@ public class DrawningCatamaran {
         _pictureWidth = null;
         _pictureHeight = null;
 
-        _drawingCatamaranPaddle = new DrawningCatamaranPaddle(entityCatamaran);
+        _drawingCatamaranPaddle = new DrawningCatamaranPaddle();
         Random random = new Random();
         int paddlesCount = random.nextInt(1,4);
         _drawingCatamaranPaddle.setEnumNumber(paddlesCount);
@@ -49,6 +47,8 @@ public class DrawningCatamaran {
 
         if (_drawingCatamaranHeight > height || _drawingCatamaranWidth > width)
             return false;
+        _pictureHeight = height;
+        _pictureWidth = width;
 
         if (_startPosX != null && _startPosY != null)
         {
@@ -57,15 +57,10 @@ public class DrawningCatamaran {
             if (_startPosY + _drawingCatamaranHeight > height)
                 _startPosY = height - _drawingCatamaranHeight;
         }
-        _pictureHeight = height;
-        _pictureWidth = width;
+
         return true;
 
 
-
-
-
-
     }
 
     public boolean moveTransport(DirectionType direction) {
diff --git a/ProjectCatamaran/src/DrawningCatamaranPaddle.java b/ProjectCatamaran/src/DrawningCatamaranPaddle.java
index 7c3af53..e7e1eb1 100644
--- a/ProjectCatamaran/src/DrawningCatamaranPaddle.java
+++ b/ProjectCatamaran/src/DrawningCatamaranPaddle.java
@@ -2,14 +2,11 @@ import java.awt.*;
 
 public class DrawningCatamaranPaddle {
     private PaddlesCount _paddlesCount;
-    private final EntityCatamaran _entityCatamaran;
-    public DrawningCatamaranPaddle(EntityCatamaran entityCatamaran) {
-        _entityCatamaran = entityCatamaran;
-    }
+
 
     public void setEnumNumber(int paddlesCount) {
         for (PaddlesCount value : PaddlesCount.values()) {
-            if (value.enumNumber == paddlesCount) {
+            if (value.getEnumNumber() == paddlesCount) {
                 _paddlesCount = value;
                 return;
             }
@@ -22,7 +19,7 @@ public class DrawningCatamaranPaddle {
         g2d.setColor(color);
         g2d.setStroke(new BasicStroke(4));
         int distanceBetweenPaddles = 27;
-        for (int i = 0; i < _paddlesCount.enumNumber; i++) {
+        for (int i = 0; i < _paddlesCount.getEnumNumber(); i++) {
             int posX = (int)(startPosX + i * distanceBetweenPaddles); // Позиция X для текущей пары весел
             drawPaddlePair(g2d, posX, (int)startPosY + 5);
 
@@ -31,16 +28,7 @@ public class DrawningCatamaranPaddle {
 
     }
     private void drawPaddlePair(Graphics2D g2d, int posX, int posY) {
-
-        if (!_entityCatamaran.getFloaters()) {
-            g2d.drawLine(posX + 20, posY + 20, posX + 5, posY + 5); // Рисуем левое весло
-            g2d.drawLine(posX + 20, posY + 45, posX + 5, posY + 60); // Рисуем правое весло
-        } else {
-            g2d.drawLine(posX + 20, posY + 10, posX + 5, posY - 5); // Рисуем левое весло
-            g2d.drawLine(posX + 20, posY + 55, posX + 5, posY + 70); // Рисуем правое весло
-        }
-
-
-
+        g2d.drawLine(posX + 20, posY + 15, posX + 5, posY); // Рисуем левое весло
+        g2d.drawLine(posX + 20, posY + 50, posX + 5, posY + 65); // Рисуем правое весло
     }
 }
diff --git a/ProjectCatamaran/src/FormCatamaran.java b/ProjectCatamaran/src/FormCatamaran.java
index 6f979bd..3cb1fc2 100644
--- a/ProjectCatamaran/src/FormCatamaran.java
+++ b/ProjectCatamaran/src/FormCatamaran.java
@@ -81,7 +81,7 @@ public class FormCatamaran extends JFrame {
 
     }
     private void Draw() {
-        if (_drawningCatamaran.EntityCatamaran() == null)
+        if (_drawningCatamaran.getEntityCatamaran() == null)
             return;
         if (PictureBox.getWidth() == 0 || PictureBox.getHeight() == 0) {
             return;
diff --git a/ProjectCatamaran/src/Main.java b/ProjectCatamaran/src/Main.java
index c84d30b..c243058 100644
--- a/ProjectCatamaran/src/Main.java
+++ b/ProjectCatamaran/src/Main.java
@@ -10,7 +10,7 @@ public class Main {
         frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         frame.setLocation(500, 200);
         frame.pack();
-        frame.setSize(1000, 500);
+        frame.setSize(700, 500);
         frame.setVisible(true);
         //TIP Press <shortcut actionId="ShowIntentionActions"/> with your caret at the highlighted text
         // to see how IntelliJ IDEA suggests fixing it.
diff --git a/ProjectCatamaran/src/PaddlesCount.java b/ProjectCatamaran/src/PaddlesCount.java
index 24b56ae..5ab5d2b 100644
--- a/ProjectCatamaran/src/PaddlesCount.java
+++ b/ProjectCatamaran/src/PaddlesCount.java
@@ -3,6 +3,12 @@ public enum PaddlesCount {
     Two(2),
     Three(3);
 
-    public final int enumNumber;
-    PaddlesCount(int i) {this.enumNumber = i;}
+    final private int EnumNumber;
+    PaddlesCount(int enumNumber) {
+        EnumNumber = enumNumber;
+    }
+    public int getEnumNumber() {
+        return EnumNumber;
+    }
+
 }
diff --git a/out/production/ProjectCatamaran/DrawningCatamaran$1.class b/out/production/ProjectCatamaran/DrawningCatamaran$1.class
index 2bac64c249e07503999cd32eecbca5a23b5bae6b..d22cde917dc789888fb1c0d73454b34d68820cdc 100644
GIT binary patch
delta 13
Ucmcc0dX;rU3lpQy<W{Bt03?D0q5uE@

delta 13
Ucmcc0dX;rU3lpQ)<W{Bt03>(>pa1{>

diff --git a/out/production/ProjectCatamaran/DrawningCatamaran.class b/out/production/ProjectCatamaran/DrawningCatamaran.class
index 798c3bc171056b42f703be68b124cc09a82ab42c..72d27731a9b0960af092974b8c553c975a19b013 100644
GIT binary patch
literal 5636
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
DhQ3RJ

literal 5647
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
J@x>3X`+o!{PW%7>

diff --git a/out/production/ProjectCatamaran/DrawningCatamaranPaddle.class b/out/production/ProjectCatamaran/DrawningCatamaranPaddle.class
index 0322ae7444701b72128b8485759985252f780430..0cbd76f98e3d8e063c5a955595a0cc63d88afd56 100644
GIT binary patch
delta 872
zcmYLHO-~b16g_V`)0qxaD21Vv(n4*)enAnnB7PtW#Y%DGM`Gfl12%vPAy{PDm=ImC
zFl77z#*Hf%L@h=W<Jy1V(uF&hF4P5jW=dcd_uc#EynD~N_x|!fGxV?fA3p<_#N3Xa
z_v_H$Q=uDZfwA)<H{x8h8fZg6z`t0nO|NdOT;EukudWMtQt6TpL3F6-G+?4jAY?z0
zLOVYa@os^R`_^MCZ*A7{Gwasc((=Ni(J37v^caYs*G`Lsh}m-@7LForK*2EqIaN&G
zb}&f;0~oZo#DEq=%0L<!dsmD^LdY2y!mxmLZ{6A~FRxYw)KrO|U6gLwZ=_*Ult}eP
z&02UcXRY0|<{ws7oO}CIii*V`Bx)73WJ^z`ufR*2XO!nDcq*Aah+R4oMrfVifCndN
zjV1u2ILS!h6i(ARk8Ps8Jcm9&wV%soy#asZCG<>Kd5`wpEm^$&_uWbAag+AAV2vz%
z=z~tREf{34b7*x7^%K{H01C8<llGvb<DJ16i=O3eD?IzqRg4P}`AwX_d0c1`s^bqY
zd<2!VUl1Bs!b+}za9H_-=$&BS9{L+d1R@2mr=Xf@<{jEe_!Z&<rfPbZp3ZL<G*UOU
zki4x`8aTeCQoy$(0fTPtAZ2v0E1l?JOJgKE#OaNp8}(@hvxvHC?h-r(KQ7X0h$Dju
zda6V2P*)k3xP?xu%eagy?xf0?!ZbVK+!g7`ELX$~u2NbI!zeL}*X@KK(mvuULPGrI
zwn(URWtyEpjTo6ZlG)xsXC)eFtMqD>Xam`Uc+`ypla!e~8asQ-H+`HzKN95Zj6c)N
cbI3XAa&b5(U2V>GC2@_cJUWZdGL%sM4~l(r3;+NC

literal 1780
zcmZ`(-%}e^6#j0q$%bVEDG(?GXt6+(@JpjoY>-xdq@qiUQqxqODVJmiwhalBEM<K2
zq2o&*ee=obOP@Q_Qb%VPpZyPf^uJIa(C_Ys1kh$?H}{@<&Ue1=oOAcL<DZWJe1w95
z0D?L+6Cs2JVh`nGIa8LE?U_4U5AC8W5T17`j=LZbOs4W}h@ee}VWJ(TK;Lpr9#ovl
z_L6kvuB^$*x-6B-Hh~`471wdUX&wk%uvX5RvIaWPsUv3M0=fiDKe)bB-LI&`k7aq^
zt}`&1`pP<emThBTkBK;X1q{2gzk7RscgwB`h*ib#qKSSC2t*(3d2~(?JI<o$7!>IC
z6w3p5=2lJa?Ks7HX4yaj!zM1_vOuJ6yGzw_mEhe;tLf~SvZ=g|w*-2c=0#a|iW_dN
z`pDL9ehU~F!I-M;xPX?-rSb|oX(ENRKpUZbUqYP1_H6_=sAbZ`6s83_N-VWsgmvkV
z&A_RM7WM4vs)~CX@94;wco**pbe^lbK>N1s=E_y++BMdfjr~&bnl*6^bCj%7Sx$v*
z)RU|HrScxZb1)=GQA^bl{W_Jq--NqzOASDmRV~VLUe+A7Zx}Uq$6>;L>kV_0CDMQ9
zCdx9coa(Wb^azE#@!-^)?QwL&mBmMEa?eYtBS*+{(?c;zVRJMaqa~31pOR+J_dLfg
zQuki9Uf{ere6~3nEw7VaP)n%j4^FIg>d%epy(??(x(`B*&Ha7$V>?q4h_`}HAT!GZ
z?JYTstrYD=+dZ)D#*JfD6(vR+8`b?<(at%l3xjVc^t75-&Sr$yAAADp!f@54?lu24
zkUc)&`#N_y&x6yPehrbHcm@517nS9^13|vSjL@O(-aL1`9;$&4vA~_W1viMwO5rBI
zIX>q1^a=B9>L*0kCXW_^vszpmdWK7raV>K_)E|0@?!=Ew*&lj^z86n4@%*1ZRN5d^
z+5s=PovGA4jbe;M#z}sXpAtpkGW~iH!y-LHDovBj6qa}*uuLn-AH&eGB1Ga(`U%{^
z#|?siao<KCYvNZV6rssO4E2Y8!N~otE3Ywnh^w*0Y&bZp$My6}^pWo~jEu$gczEZ#
zt*5gQGLJ|4w5O5HLrgr;$^Z8j|8WmHP8CW)A6Z_+Fq<&N)g15Q3fG@fh0^jhednlg
zmA(-+EsamO(iOL+DvRD0nJe2GZhH-|a0lyNdn|m$mBws2e2xt&8^$#55+&@_A&S5;
zMsy^E_?zFRfcoS#%5X#%jj#o3)DJQ9112U0V?CQgd<G+%LrUHI4a<~giOnn1b0iy9
z!}lw-{I2<aIpx<XiQm#IoR(1xvY{DVCAlQ-k&P-t+UL=fT=1kQ$px=8YLW~1f}(<+
PC=G$kC{^TX58&RvtG95A

diff --git a/out/production/ProjectCatamaran/FormCatamaran.class b/out/production/ProjectCatamaran/FormCatamaran.class
index 5a71d422a3e866cb0d54e25aa7f6bf4a3ca4cfda..9bdd942a8a231d888a36db8206e87f82c1991a6e 100644
GIT binary patch
delta 333
zcmX|*%}N4c7=<6_)3R~g6a*5{1cB4Ih=_<5Ez0nxEHnQqC9D*+-_1nJHbFnD;9J#I
zB*sKn5Vh|jf-a&@M%o;n_q>PmzF+3A`4ZRs!_9^xSGB8|pn`I{?zDUeYdWp7Ldqab
z!pD$Wr5f#K%jvo61{pTwyJin$4YtV1A1xZnQy8RZP@*iy#DXv1y%CAv^&0^+pkTkE
zyDWa-?<ibyS$-nyQS$lUT+75fZ_{NvCPY8l&$;X<(qk@F+oje~y@E%j0Yqp7ZWY?-
zy>m*7gqSTcK^c=>EcTeALXs+3_Q_M@PDMw(|G4KtO_r<}2jN4;IbxDJQ#9nKAtP;7
Wc1(m5qMS0%8F9|ZanZdDe`|j^K1T!q

delta 300
zcmXAj%}N4c7=@piub*jVBuEHc7#4x%?1YGdiWE|7$}In)B8|+MYB|s<T3W4wZ&8<#
z7;_6j`>vv(Tj;CVocB4Lm&5r^eWYFsx;80``i=b2Gh-#2GFvh!(w584IJ-6#_GCpY
z<?`&?98l9RdflMup9h|X$Sjmi@-%Fkf6;`BN?pI_1t#vWFE)+47e>*6_3RsF$nrZQ
z1BI(08?F;UF=X2jA~MzJ)I(Z|Oef?x8`2)A3c=IAY8HJ3a~Mi%nAEXo5LX*!Xp!TP
z6^>Zrg!?J=G93-zfk)-y^49LePD#>cmJair$uC<bE>ua61RiO87P+Lr6;-Z>&#_Pa
E7l=MRi~s-t

diff --git a/out/production/ProjectCatamaran/PaddlesCount.class b/out/production/ProjectCatamaran/PaddlesCount.class
index 2557b835660b4756519c18b3db7f5c31302a1286..659af5d8de4b7a619829cf359943f2a5fae30a55 100644
GIT binary patch
delta 214
zcmey)ahsFt)W2Q(7#J8F85}oqIWRK1PWEQ}X2O-4SDNcrnwykb#K^!IoSB}NSW;S)
z%E-W?;i(zM$iSPPTH=bNgjqw=b8;9{g`g0F5`!`WgMbtRKZ5|!ShmUcnYtJ~CTB6r
z^7An;14Y;w*cdn%xEVMn_c5E>GB7e&F<1jheV~*+kY)tZtXf+b6xIM4ObiA<k_{}#
k&0qv%^FS0Zm;pr@CLd*XV76hfoy@_K#%af357yxT0K>W_O8@`>

delta 113
zcmcc3`JIF7)W2Q(7#J8F8SFQ5IWRJ&PWEQ}Cd!z}$iNw#nVy$eQd*SC$iSlEsTnr8
zl&L~ckU@z-nSnt-ih-X&0H}|3@;|07Mu*9r%(Cok42(b#_Q_kB%_nQJI51l=SWnJj
PN#nF(umy@UG1vhBl<XNG