From 0386119bccd4aeac47946be033865d2a3dd74a9d Mon Sep 17 00:00:00 2001
From: insideq <crazyandroed@gmail.com>
Date: Sat, 8 Jun 2024 11:11:56 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?=
 =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D0=B0=20=E2=84=963=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/FormAdditionalCollection.java         | 41 ++++++++++++-------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/ProjectExcavator/src/FormAdditionalCollection.java b/ProjectExcavator/src/FormAdditionalCollection.java
index 7b419ed..5fe5676 100644
--- a/ProjectExcavator/src/FormAdditionalCollection.java
+++ b/ProjectExcavator/src/FormAdditionalCollection.java
@@ -22,7 +22,8 @@ public class FormAdditionalCollection extends JFrame {
     private CanvasExcavator canvasExc = new CanvasExcavator();
     private AdditionalCollections<EntityBulldozer, IDifferentRollers> additionalCollection = null;
     private Random random = new Random();
-    private JButton buttonGenerate = new JButton("Создать");
+    private JButton buttonCreate = new JButton("Создать");
+    private JButton buttonAdd = new JButton("Добавить");
     private JList<String> listEntity = new JList<String>();
     private JList<String> listRollers = new JList<String>();
     public FormAdditionalCollection() {
@@ -31,22 +32,15 @@ public class FormAdditionalCollection extends JFrame {
         additionalCollection = new AdditionalCollections<EntityBulldozer, IDifferentRollers>(3, (Class) EntityBulldozer.class, (Class) IDifferentRollers.class);
         AddEntities();
         AddRollers();
-        buttonGenerate.addActionListener(new ActionListener() {
+
+        buttonCreate.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-
                 drawingBulldozer = additionalCollection.CreateAdditionalCollectionBulldozer();
                 drawingBulldozer.SetPictureSize(getWidth(), getHeight());
-                drawingBulldozer.SetPosition(50,50);
+                drawingBulldozer.SetPosition(50, 50);
                 canvasExc._drawingBulldozer = drawingBulldozer;
                 canvasExc.repaint();
-                DrawingBulldozer copyBulldozer;
-                if (drawingBulldozer instanceof DrawingExcavator)
-                    copyBulldozer =  new DrawingExcavator((EntityExcavator) drawingBulldozer.EntityBulldozer, drawingBulldozer.drawingRollers);
-                else
-                    copyBulldozer =  new DrawingBulldozer(drawingBulldozer.EntityBulldozer, drawingBulldozer.drawingRollers);
-                company._collection.Insert(copyBulldozer);
-                FormBulldozerCollection.canvasShow();
 
                 String[] data1 = new String[additionalCollection.CountEntities];
                 for (int i = 0; i < additionalCollection.CountEntities; i++) {
@@ -62,8 +56,25 @@ public class FormAdditionalCollection extends JFrame {
                 listRollers.setListData(data2);
             }
         });
-        buttonGenerate.setBounds(450, 10, 100, 50);
-        add(buttonGenerate);
+
+        buttonAdd.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if (drawingBulldozer != null) {
+                    DrawingBulldozer copyBulldozer;
+                    if (drawingBulldozer instanceof DrawingExcavator)
+                        copyBulldozer = new DrawingExcavator((EntityExcavator) drawingBulldozer.EntityBulldozer, drawingBulldozer.drawingRollers);
+                    else
+                        copyBulldozer = new DrawingBulldozer(drawingBulldozer.EntityBulldozer, drawingBulldozer.drawingRollers);
+                    company._collection.Insert(copyBulldozer);
+                    FormBulldozerCollection.canvasShow();
+                }
+            }
+        });
+        buttonCreate.setBounds(300, 10, 100, 50);
+        buttonAdd.setBounds(450, 10, 100, 50);
+        add(buttonCreate);
+        add(buttonAdd);
         listEntity.setBounds(10,200,300,60);
         listRollers.setBounds(320,200,300,60);
         add(listEntity);
@@ -81,10 +92,10 @@ public class FormAdditionalCollection extends JFrame {
     private String ToString(IDifferentRollers rollers) {
         if (rollers == null || rollers.getRollersCount() == null)
             return "Dont have rollers";
-        String str = "Deck ";
+        String str = "Rollers ";
         if (rollers instanceof DrawingRollersCross) str += "Type Cross ";
         else if (rollers instanceof DrawingRollersPlus) str += "Type Plus ";
-        else str += "Type 3 ";
+        else str += "Type Star ";
         str += rollers.getRollersCount().toString();
         return str;
     }