From b564eb8ff447b761cfc39fe9e6a5cac69e4596c7 Mon Sep 17 00:00:00 2001
From: prodigygirl <Prodigygirl1.0@yandex.ru>
Date: Sun, 20 Nov 2022 11:17:50 +0400
Subject: [PATCH] =?UTF-8?q?3.=20=D0=A3=D0=B1=D0=BE=D1=80=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=B8=20=D0=BA=D1=80=D0=B0=D1=81=D0=BE=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/Delegator.java            |  3 +-
 src/main/java/FormArmoredCarConfig.form | 39 ++++++++++++++++++++-----
 src/main/java/FormArmoredCarConfig.java |  7 ++---
 3 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/src/main/java/Delegator.java b/src/main/java/Delegator.java
index f9c7673..e0ae57b 100644
--- a/src/main/java/Delegator.java
+++ b/src/main/java/Delegator.java
@@ -1,9 +1,8 @@
-import java.awt.*;
 import java.lang.reflect.Method;
 import java.util.HashMap;
 
 
-public class Delegator<T extends DrawingArmoredCar> {
+public class Delegator<T> {
     private HashMap<Method, Object> methods = new HashMap<>();
 
     public void add(Method method_ref, Object consumer) {
diff --git a/src/main/java/FormArmoredCarConfig.form b/src/main/java/FormArmoredCarConfig.form
index 12660e9..6bbb60b 100644
--- a/src/main/java/FormArmoredCarConfig.form
+++ b/src/main/java/FormArmoredCarConfig.form
@@ -42,17 +42,23 @@
               </component>
               <component id="ce0c6" class="javax.swing.JLabel" binding="labelBaseColor">
                 <constraints>
-                  <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
+                  <grid row="0" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="0" anchor="0" fill="0" indent="0" use-parent-layout="false">
+                    <minimum-size width="60" height="30"/>
+                  </grid>
                 </constraints>
                 <properties>
+                  <horizontalAlignment value="0"/>
                   <text value="Цвет"/>
                 </properties>
               </component>
               <component id="e8476" class="javax.swing.JLabel" binding="labelDopColor">
                 <constraints>
-                  <grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
+                  <grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="0" indent="0" use-parent-layout="false">
+                    <minimum-size width="60" height="30"/>
+                  </grid>
                 </constraints>
                 <properties>
+                  <horizontalAlignment value="0"/>
                   <text value="Доп. Цвет"/>
                 </properties>
               </component>
@@ -102,6 +108,7 @@
               <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
+              <horizontalAlignment value="11"/>
               <text value="Скорость:"/>
             </properties>
           </component>
@@ -134,25 +141,34 @@
               </grid>
               <component id="486f2" class="javax.swing.JLabel" binding="labelDoubleCaterpillar">
                 <constraints>
-                  <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                  <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false">
+                    <minimum-size width="-1" height="30"/>
+                  </grid>
                 </constraints>
                 <properties>
+                  <horizontalAlignment value="0"/>
                   <text value="Двойные"/>
                 </properties>
               </component>
               <component id="287da" class="javax.swing.JLabel" binding="labelSimpleCaterpillar">
                 <constraints>
-                  <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                  <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false">
+                    <minimum-size width="-1" height="30"/>
+                  </grid>
                 </constraints>
                 <properties>
+                  <horizontalAlignment value="0"/>
                   <text value="Обычные"/>
                 </properties>
               </component>
               <component id="61c17" class="javax.swing.JLabel" binding="labelCrossCaterpillar">
                 <constraints>
-                  <grid row="1" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                  <grid row="1" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false">
+                    <minimum-size width="-1" height="30"/>
+                  </grid>
                 </constraints>
                 <properties>
+                  <horizontalAlignment value="0"/>
                   <text value="Крестики"/>
                 </properties>
               </component>
@@ -166,17 +182,24 @@
                 <children>
                   <component id="88d7e" class="javax.swing.JLabel" binding="labelModifiedObject">
                     <constraints>
-                      <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                      <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false">
+                        <minimum-size width="80" height="30"/>
+                      </grid>
                     </constraints>
                     <properties>
+                      <horizontalAlignment value="0"/>
                       <text value="Продвинутый"/>
                     </properties>
                   </component>
                   <component id="e9351" class="javax.swing.JLabel" binding="labelSimpleObject">
                     <constraints>
-                      <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                      <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false">
+                        <minimum-size width="80" height="30"/>
+                      </grid>
                     </constraints>
                     <properties>
+                      <horizontalAlignment value="0"/>
+                      <horizontalTextPosition value="11"/>
                       <text value="Простой"/>
                     </properties>
                   </component>
@@ -223,7 +246,7 @@
               <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="Количество катков"/>
+              <text value="Количество катков:"/>
             </properties>
           </component>
         </children>
diff --git a/src/main/java/FormArmoredCarConfig.java b/src/main/java/FormArmoredCarConfig.java
index 253d4a9..7f6aeb8 100644
--- a/src/main/java/FormArmoredCarConfig.java
+++ b/src/main/java/FormArmoredCarConfig.java
@@ -1,13 +1,9 @@
 import javax.swing.*;
 import javax.swing.border.LineBorder;
 import java.awt.*;
-import java.awt.datatransfer.UnsupportedFlavorException;
 import java.awt.dnd.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.io.IOException;
 import java.lang.reflect.Method;
 
 public class FormArmoredCarConfig extends JDialog{
@@ -79,7 +75,8 @@ public class FormArmoredCarConfig extends JDialog{
 
 
         buttonOk.addActionListener(e -> {
-            delegator.invoke(armoredCar);
+            if (delegator != null)
+                delegator.invoke(armoredCar);
             dispose();
         });
     }