From 3989c62269756180160f60d9398023633ec591d5 Mon Sep 17 00:00:00 2001
From: ekallin <elina_kallin@mail.ru>
Date: Tue, 7 Nov 2023 00:52:46 +0400
Subject: [PATCH] Modified FormLocomotiveCollections

---
 .../FormLocomotiveCollections.form            | 66 ++++++++++++++-----
 .../FormLocomotiveCollections.java            |  4 ++
 2 files changed, 54 insertions(+), 16 deletions(-)

diff --git a/ProjectElectricLocomotive/FormLocomotiveCollections.form b/ProjectElectricLocomotive/FormLocomotiveCollections.form
index b1bcaa2..ac1e08b 100644
--- a/ProjectElectricLocomotive/FormLocomotiveCollections.form
+++ b/ProjectElectricLocomotive/FormLocomotiveCollections.form
@@ -3,7 +3,7 @@
   <grid id="27dc6" binding="MainPanel" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="20" y="20" width="708" height="423"/>
+      <xy x="20" y="20" width="708" height="464"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -21,7 +21,7 @@
         <border type="line"/>
         <children/>
       </grid>
-      <grid id="40d5" binding="Instruments" layout-manager="GridLayoutManager" row-count="7" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+      <grid id="40d5" binding="Instruments" layout-manager="GridLayoutManager" row-count="10" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
           <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="true">
@@ -39,20 +39,62 @@
         <children>
           <vspacer id="1eee0">
             <constraints>
-              <grid row="1" column="1" row-span="6" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+              <grid row="3" column="1" row-span="7" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
             </constraints>
           </vspacer>
+          <component id="5039" class="javax.swing.JTextField" binding="textBoxStorageName">
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                <preferred-size width="150" height="-1"/>
+              </grid>
+            </constraints>
+            <properties/>
+          </component>
+          <component id="50eff" class="javax.swing.JButton" binding="ButtonAddObject">
+            <constraints>
+              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <horizontalAlignment value="0"/>
+              <horizontalTextPosition value="0"/>
+              <text value="Добавить набор"/>
+            </properties>
+          </component>
+          <component id="5ef9c" class="javax.swing.JList" binding="listBoxStorage">
+            <constraints>
+              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="2" anchor="0" fill="3" indent="0" use-parent-layout="false">
+                <preferred-size width="150" height="50"/>
+              </grid>
+            </constraints>
+            <properties/>
+          </component>
+          <component id="1b1c" class="javax.swing.JButton" binding="ButtonCreateRandomLoco">
+            <constraints>
+              <grid row="9" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Создать рандомный локо "/>
+            </properties>
+          </component>
           <component id="138d" class="javax.swing.JButton" binding="ButtonAddLocomotive">
             <constraints>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+              <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text value="Добавить локо"/>
             </properties>
           </component>
+          <component id="b21cb" class="javax.swing.JButton" binding="ButtonRefreshCollection">
+            <constraints>
+              <grid row="8" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Обновить "/>
+            </properties>
+          </component>
           <component id="1d01d" class="javax.swing.JButton" binding="ButtonRemoveLocomotive">
             <constraints>
-              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+              <grid row="7" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text value="Удалить локо"/>
@@ -60,7 +102,7 @@
           </component>
           <component id="25553" class="javax.swing.JTextField" binding="textFieldNumber">
             <constraints>
-              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+              <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
                 <preferred-size width="150" height="-1"/>
               </grid>
             </constraints>
@@ -68,20 +110,12 @@
               <text value="-"/>
             </properties>
           </component>
-          <component id="b21cb" class="javax.swing.JButton" binding="ButtonRefreshCollection">
+          <component id="d1477" class="javax.swing.JButton" binding="ButtomRemoveObject">
             <constraints>
               <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="Обновить "/>
-            </properties>
-          </component>
-          <component id="1b1c" class="javax.swing.JButton" binding="ButtonCreateRandomLoco">
-            <constraints>
-              <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="Создать рандомный локо "/>
+              <text value="Удалить набор"/>
             </properties>
           </component>
         </children>
diff --git a/ProjectElectricLocomotive/FormLocomotiveCollections.java b/ProjectElectricLocomotive/FormLocomotiveCollections.java
index 6f879ae..ebabad0 100644
--- a/ProjectElectricLocomotive/FormLocomotiveCollections.java
+++ b/ProjectElectricLocomotive/FormLocomotiveCollections.java
@@ -15,6 +15,10 @@ public class FormLocomotiveCollections {
     private JButton ButtonRefreshCollection;
     private JButton ButtonRemoveLocomotive;
     private JButton ButtonCreateRandomLoco;
+    private JTextField textBoxStorageName;
+    private JButton ButtonAddObject;
+    private JList listBoxStorage;
+    private JButton ButtomRemoveObject;
     public DrawingLocomotive loco;
     LocomotiveGenericCollection<DrawingLocomotive, DrawingObjectLocomotive> _locomotives;