From 9bf470f992ed063b4a2770a42dae503fd7f457d7 Mon Sep 17 00:00:00 2001
From: prodigygirl <Prodigygirl1.0@yandex.ru>
Date: Sat, 22 Oct 2022 20:30:56 +0400
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F:=20=D0=B7=D0=B0=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D0=BC=D0=BE=D0=B4=D0=B8=D1=84=D0=B8=D0=BA=D0=B0=D1=82?=
 =?UTF-8?q?=D0=BE=D1=80=D0=B0=20=D0=BF=D0=BE=D0=BB=D1=8F=20=D0=BD=D0=B0=20?=
 =?UTF-8?q?private,=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20getter-=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/DrawingArmoredCar.java  | 8 ++++++--
 src/main/java/DrawingCaterpillar.java | 1 -
 src/main/java/FormCar.java            | 6 +++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/DrawingArmoredCar.java b/src/main/java/DrawingArmoredCar.java
index a0e81b1..cc471df 100644
--- a/src/main/java/DrawingArmoredCar.java
+++ b/src/main/java/DrawingArmoredCar.java
@@ -2,7 +2,7 @@ import java.awt.*;
 import java.util.Random;
 
 public class DrawingArmoredCar {
-    public EntityArmoredCar armoredCar;
+    private EntityArmoredCar armoredCar;
 
     private float startPosX;
 
@@ -18,6 +18,10 @@ public class DrawingArmoredCar {
 
     private DrawingCaterpillar drawingCaterpillar;
 
+    public EntityArmoredCar getArmoredCar() {
+        return armoredCar;
+    }
+
     public void Init(int speed, float weight, Color bodyColor) {
         this.armoredCar = new EntityArmoredCar();
         this.armoredCar.init(speed, weight, bodyColor);
@@ -27,7 +31,7 @@ public class DrawingArmoredCar {
     }
 
     public void SetPosition(int x, int y, int width, int height) {
-        if (x > 0 && y > 0 && x + carWidth < width && y + carHeight < height) {
+        if (x >= 0 && y >= 0 && x + carWidth < width && y + carHeight < height) {
             startPosX = x;
             startPosY = y;
             pictureWidth = width;
diff --git a/src/main/java/DrawingCaterpillar.java b/src/main/java/DrawingCaterpillar.java
index 3a1e4be..ae2fb0c 100644
--- a/src/main/java/DrawingCaterpillar.java
+++ b/src/main/java/DrawingCaterpillar.java
@@ -21,7 +21,6 @@ public class DrawingCaterpillar {
                 break;
             }
         }
-
     }
 
     public void DrawCaterpillar(Graphics2D g2d, int startPosX, int startPosY)
diff --git a/src/main/java/FormCar.java b/src/main/java/FormCar.java
index 3e61b40..176f0b0 100644
--- a/src/main/java/FormCar.java
+++ b/src/main/java/FormCar.java
@@ -49,9 +49,9 @@ public class FormCar extends JFrame{
                 armoredCar.SetPosition(rnd.nextInt(90) + 10, rnd.nextInt(90) + 10,
                         drawPanel.getWidth(), drawPanel.getHeight());
 
-                labelSpeed.setText("Скорость: " + armoredCar.armoredCar.getSpeed());
-                labelWeight.setText("Вес: " + armoredCar.armoredCar.getWeight());
-                labelColor.setText("Цвет: " + armoredCar.armoredCar.getWeight());
+                labelSpeed.setText("Скорость: " + armoredCar.getArmoredCar().getSpeed());
+                labelWeight.setText("Вес: " + armoredCar.getArmoredCar().getWeight());
+                labelColor.setText("Цвет: " + armoredCar.getArmoredCar().getWeight());
             }
         });