Компания

Cruiser/Cruiser/CollectionGenericObjects/CollectionType.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Cruiser.CollectionGenericObjects;
+
+public enum CollectionType
+{
+    None = 1, 
+    Massive = 1,
+    List = 2
+}

Cruiser/Cruiser/CollectionGenericObjects/ListGenericObjects.cs

@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Cruiser.CollectionGenericObjects;
+
+public class ListGenericObjects<T> : ICollectionGenericObjects<T>
+    where T : class
+{
+    /// <summary>
+	/// Список объектов, которые храним
+	/// </summary>
+	private readonly List<T?> _collection;
+
+    /// <summary>
+    /// Максимально допустимое число объектов в списке
+    /// </summary>
+    private int _maxCount;
+
+    public int Count => _collection.Count;
+
+    public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } }
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public ListGenericObjects()
+    {
+        _collection = new();
+    }
+
+    public T? Get(int position)
+    {
+        // TODO проверка позиции
+        if (position < 0 || position >= Count)
+        {
+            return null;
+        }
+        return _collection[position];
+    }
+
+    public int Insert(T obj)
+    {
+        if (Count == _maxCount)
+        {
+            return -1;
+        }
+        _collection.Add(obj);
+        return Count;
+    }
+
+    public int Insert(T obj, int position)
+    {
+        // TODO проверка, что не превышено максимальное количество элементов
+        // TODO проверка позиции
+        // TODO вставка по позиции
+        if (Count == _maxCount)
+        {
+            return -1;
+        }
+        if (position >= Count || position < 0)
+        {
+            return -1;
+        }
+        _collection.Insert(position, obj);
+        return position;
+    }
+
+    public T Remove(int position)
+    {
+        // TODO проверка позиции
+        // TODO удаление объекта из списка
+        if (position >= Count || position < 0)
+        {
+            return null;
+        }
+        T obj = _collection[position];
+        _collection.RemoveAt(position);
+        return obj;
+    }
+}

Cruiser/Cruiser/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -14,7 +14,23 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
 
     public int Count => _collection.Length;
 
-    public int SetMaxCount { set { if (value > 0) { _collection = new T?[value]; } } }
+    public int SetMaxCount
+    {
+        set
+        {
+            if (value > 0)
+            {
+                if (_collection.Length > 0)
+                {
+                    Array.Resize(ref _collection, value);
+                }
+                else
+                {
+                    _collection = new T?[value];
+                }
+            }
+        }
+    }
 
     public MassiveGenericObjects()
     {
@@ -23,12 +39,12 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
 
     public T? Get(int position)
     {
-        if (position >= _collection.Length || position < 0)
+        if (position >= 0 || position < Count)
         {
-            return default(T?);
-        }
             return _collection[position];
         }
+        return null;
+    }
 
     public int Insert(T obj)
     {

Cruiser/Cruiser/CollectionGenericObjects/StorageCollection.cs

@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Cruiser.CollectionGenericObjects;
+
+public class StorageCollection<T> where T : class
+{
+    /// <summary>
+    /// Словарь хранилище с коллекциями
+    /// </summary>
+    readonly Dictionary<string, ICollectionGenericObjects<T>> _storages;
+
+    /// <summary>
+    /// Возвращение списка названия коллекций
+    /// </summary>
+    public List<string> Keys => _storages.Keys.ToList();
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public StorageCollection()
+    {
+        _storages = new Dictionary<string, ICollectionGenericObjects<T>>();
+    }
+
+    /// <summary>
+    /// Добавление коллекции в хранилище
+    /// </summary>
+    /// <param name="name">Название коллекции</param>
+    /// <param name="collectionType">Тип коллекции</param>
+    public void AddCollection(string name, CollectionType collectionType)
+    {
+        if (_storages.ContainsKey(name))// || collectionType == CollectionType.None)
+        {
+            return;
+        }
+
+        switch (collectionType)
+        {
+            case CollectionType.Massive:
+                _storages[name] = new MassiveGenericObjects<T>();
+                break;
+            case CollectionType.List:
+                _storages[name] = new ListGenericObjects<T>();
+                break;
+        }
+    }
+
+    /// <summary>
+    /// Удаление коллекции
+    /// </summary>
+    /// <param name="name">Название коллекции</param>
+    public void DelCollection(string name)
+    {
+        if (_storages.ContainsKey(name) && name != null)
+        {
+            _storages.Remove(name);
+        }
+    }
+
+    /// <summary>
+    /// Доступ к коллекции
+    /// </summary>
+    /// <param name="name">Название коллекции</param>
+    /// <returns></returns>
+    public ICollectionGenericObjects<T>? this[string name]
+    {
+        get
+        {
+            if (_storages.ContainsKey(name))
+            {
+                return _storages[name];
+            }
+            return null;
+        }
+    }
+}

Cruiser/Cruiser/FormCruiser.Designer.cs

@@ -43,7 +43,7 @@
             pictureBoxCruiser.Dock = DockStyle.Fill;
             pictureBoxCruiser.Location = new Point(0, 0);
             pictureBoxCruiser.Name = "pictureBoxCruiser";
-            pictureBoxCruiser.Size = new Size(1002, 724);
+            pictureBoxCruiser.Size = new Size(1016, 724);
             pictureBoxCruiser.SizeMode = PictureBoxSizeMode.CenterImage;
             pictureBoxCruiser.TabIndex = 9;
             pictureBoxCruiser.TabStop = false;
@@ -53,7 +53,7 @@
             buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
             buttonRight.BackgroundImage = Properties.Resources.arrowRight;
             buttonRight.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonRight.Location = new Point(955, 678);
+            buttonRight.Location = new Point(969, 678);
             buttonRight.Name = "buttonRight";
             buttonRight.Size = new Size(35, 35);
             buttonRight.TabIndex = 4;
@@ -65,7 +65,7 @@
             buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
             buttonDown.BackgroundImage = Properties.Resources.arrowDown;
             buttonDown.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonDown.Location = new Point(914, 678);
+            buttonDown.Location = new Point(928, 678);
             buttonDown.Name = "buttonDown";
             buttonDown.Size = new Size(35, 35);
             buttonDown.TabIndex = 5;
@@ -77,7 +77,7 @@
             buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
             buttonUp.BackgroundImage = Properties.Resources.arrowUp;
             buttonUp.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonUp.Location = new Point(914, 637);
+            buttonUp.Location = new Point(928, 637);
             buttonUp.Name = "buttonUp";
             buttonUp.Size = new Size(35, 35);
             buttonUp.TabIndex = 6;
@@ -89,7 +89,7 @@
             buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
             buttonLeft.BackgroundImage = Properties.Resources.arrowLeft;
             buttonLeft.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonLeft.Location = new Point(873, 678);
+            buttonLeft.Location = new Point(887, 678);
             buttonLeft.Name = "buttonLeft";
             buttonLeft.Size = new Size(35, 35);
             buttonLeft.TabIndex = 7;
@@ -120,7 +120,7 @@
             // 
             AutoScaleDimensions = new SizeF(8F, 20F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(1002, 724);
+            ClientSize = new Size(1016, 724);
             Controls.Add(buttonStrategyStep);
             Controls.Add(comboBoxStrategy);
             Controls.Add(buttonLeft);

Cruiser/Cruiser/FormShipCollection.Designer.cs

@@ -29,133 +29,250 @@
         private void InitializeComponent()
         {
             groupBoxTools = new GroupBox();
+            panelCompanyTools = new Panel();
+            buttonCreateCompany = new Button();
             buttonRefresh = new Button();
-            buttonGoToCheck = new Button();
-            buttonRemoveShip = new Button();
-            maskedTextBox = new MaskedTextBox();
-            buttonAddCruiser = new Button();
-            buttonAddShip = new Button();
             comboBoxSelectorCompany = new ComboBox();
-            pictureBox = new PictureBox();
+            buttonGoToCheck = new Button();
+            buttonAddShip = new Button();
+            buttonRemoveShip = new Button();
+            buttonAddCruiser = new Button();
+            maskedTextBox = new MaskedTextBox();
+            panelStorage = new Panel();
+            buttonCollectionDel = new Button();
+            listBoxCollection = new ListBox();
+            buttonCollectionAdd = new Button();
+            radioButtonList = new RadioButton();
+            radioButtonMassive = new RadioButton();
+            textBoxCollectionName = new TextBox();
+            labelCollectionName = new Label();
+            pictureBoxCollection = new PictureBox();
             groupBoxTools.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
+            panelCompanyTools.SuspendLayout();
+            panelStorage.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxCollection).BeginInit();
             SuspendLayout();
             // 
             // groupBoxTools
             // 
-            groupBoxTools.Controls.Add(buttonRefresh);
+            groupBoxTools.Controls.Add(buttonCreateCompany);
-            groupBoxTools.Controls.Add(buttonGoToCheck);
+            groupBoxTools.Controls.Add(panelCompanyTools);
-            groupBoxTools.Controls.Add(buttonRemoveShip);
+            groupBoxTools.Controls.Add(panelStorage);
-            groupBoxTools.Controls.Add(maskedTextBox);
-            groupBoxTools.Controls.Add(buttonAddCruiser);
-            groupBoxTools.Controls.Add(buttonAddShip);
-            groupBoxTools.Controls.Add(comboBoxSelectorCompany);
             groupBoxTools.Dock = DockStyle.Right;
             groupBoxTools.Location = new Point(852, 0);
             groupBoxTools.Name = "groupBoxTools";
-            groupBoxTools.Size = new Size(324, 661);
+            groupBoxTools.Size = new Size(324, 770);
             groupBoxTools.TabIndex = 0;
             groupBoxTools.TabStop = false;
             groupBoxTools.Text = "Инструменты";
             // 
+            // panelCompanyTools
+            // 
+            panelCompanyTools.Controls.Add(buttonRefresh);
+            panelCompanyTools.Controls.Add(comboBoxSelectorCompany);
+            panelCompanyTools.Controls.Add(buttonGoToCheck);
+            panelCompanyTools.Controls.Add(buttonAddShip);
+            panelCompanyTools.Controls.Add(buttonRemoveShip);
+            panelCompanyTools.Controls.Add(buttonAddCruiser);
+            panelCompanyTools.Controls.Add(maskedTextBox);
+            panelCompanyTools.Enabled = false;
+            panelCompanyTools.Location = new Point(12, 386);
+            panelCompanyTools.Name = "panelCompanyTools";
+            panelCompanyTools.Size = new Size(300, 378);
+            panelCompanyTools.TabIndex = 2;
+            // 
+            // buttonCreateCompany
+            // 
+            buttonCreateCompany.Location = new Point(31, 346);
+            buttonCreateCompany.Name = "buttonCreateCompany";
+            buttonCreateCompany.Size = new Size(240, 29);
+            buttonCreateCompany.TabIndex = 8;
+            buttonCreateCompany.Text = "Создать компанию";
+            buttonCreateCompany.UseVisualStyleBackColor = true;
+            buttonCreateCompany.Click += ButtonCreateCompany_Click;
+            // 
             // buttonRefresh
             // 
             buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRefresh.Location = new Point(6, 466);
+            buttonRefresh.Location = new Point(19, 313);
             buttonRefresh.Name = "buttonRefresh";
-            buttonRefresh.Size = new Size(306, 52);
+            buttonRefresh.Size = new Size(240, 52);
             buttonRefresh.TabIndex = 6;
             buttonRefresh.Text = "Обновить";
             buttonRefresh.UseVisualStyleBackColor = true;
             buttonRefresh.Click += ButtonRefresh_Click;
             // 
-            // buttonGoToCheck
-            // 
-            buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonGoToCheck.Location = new Point(6, 370);
-            buttonGoToCheck.Name = "buttonGoToCheck";
-            buttonGoToCheck.Size = new Size(306, 52);
-            buttonGoToCheck.TabIndex = 5;
-            buttonGoToCheck.Text = "Передать на тесты";
-            buttonGoToCheck.UseVisualStyleBackColor = true;
-            buttonGoToCheck.Click += ButtonGoToCheck_Click;
-            // 
-            // buttonRemoveShip
-            // 
-            buttonRemoveShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRemoveShip.Location = new Point(6, 279);
-            buttonRemoveShip.Name = "buttonRemoveShip";
-            buttonRemoveShip.Size = new Size(306, 52);
-            buttonRemoveShip.TabIndex = 4;
-            buttonRemoveShip.Text = "Удалить корабль";
-            buttonRemoveShip.UseVisualStyleBackColor = true;
-            buttonRemoveShip.Click += ButtonRemoveShip_Click;
-            // 
-            // maskedTextBox
-            // 
-            maskedTextBox.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            maskedTextBox.Location = new Point(6, 246);
-            maskedTextBox.Mask = "00";
-            maskedTextBox.Name = "maskedTextBox";
-            maskedTextBox.Size = new Size(306, 27);
-            maskedTextBox.TabIndex = 3;
-            maskedTextBox.ValidatingType = typeof(int);
-            // 
-            // buttonAddCruiser
-            // 
-            buttonAddCruiser.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonAddCruiser.Location = new Point(6, 159);
-            buttonAddCruiser.Name = "buttonAddCruiser";
-            buttonAddCruiser.Size = new Size(306, 52);
-            buttonAddCruiser.TabIndex = 2;
-            buttonAddCruiser.Text = "Добавление круизера";
-            buttonAddCruiser.UseVisualStyleBackColor = true;
-            buttonAddCruiser.Click += ButtonAddCruiser_Click;
-            // 
-            // buttonAddShip
-            // 
-            buttonAddShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonAddShip.Location = new Point(6, 101);
-            buttonAddShip.Name = "buttonAddShip";
-            buttonAddShip.Size = new Size(306, 52);
-            buttonAddShip.TabIndex = 1;
-            buttonAddShip.Text = "Добавление корабля";
-            buttonAddShip.UseVisualStyleBackColor = true;
-            buttonAddShip.Click += ButtonAddShip_Click;
-            // 
             // comboBoxSelectorCompany
             // 
             comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
             comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
             comboBoxSelectorCompany.FormattingEnabled = true;
             comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
-            comboBoxSelectorCompany.Location = new Point(6, 26);
+            comboBoxSelectorCompany.Location = new Point(19, 14);
             comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
-            comboBoxSelectorCompany.Size = new Size(306, 28);
+            comboBoxSelectorCompany.Size = new Size(240, 28);
             comboBoxSelectorCompany.TabIndex = 0;
             comboBoxSelectorCompany.SelectedIndexChanged += comboBoxSelectorCompany_SelectedIndexChanged;
             // 
-            // pictureBox
+            // buttonGoToCheck
             // 
-            pictureBox.Dock = DockStyle.Fill;
+            buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            pictureBox.Location = new Point(0, 0);
+            buttonGoToCheck.Location = new Point(19, 255);
-            pictureBox.Name = "pictureBox";
+            buttonGoToCheck.Name = "buttonGoToCheck";
-            pictureBox.Size = new Size(852, 661);
+            buttonGoToCheck.Size = new Size(240, 52);
-            pictureBox.TabIndex = 1;
+            buttonGoToCheck.TabIndex = 5;
-            pictureBox.TabStop = false;
+            buttonGoToCheck.Text = "Передать на тесты";
+            buttonGoToCheck.UseVisualStyleBackColor = true;
+            buttonGoToCheck.Click += ButtonGoToCheck_Click;
+            // 
+            // buttonAddShip
+            // 
+            buttonAddShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddShip.Location = new Point(19, 48);
+            buttonAddShip.Name = "buttonAddShip";
+            buttonAddShip.Size = new Size(240, 52);
+            buttonAddShip.TabIndex = 1;
+            buttonAddShip.Text = "Добавление корабля";
+            buttonAddShip.UseVisualStyleBackColor = true;
+            buttonAddShip.Click += ButtonAddShip_Click;
+            // 
+            // buttonRemoveShip
+            // 
+            buttonRemoveShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRemoveShip.Location = new Point(19, 197);
+            buttonRemoveShip.Name = "buttonRemoveShip";
+            buttonRemoveShip.Size = new Size(240, 52);
+            buttonRemoveShip.TabIndex = 4;
+            buttonRemoveShip.Text = "Удалить корабль";
+            buttonRemoveShip.UseVisualStyleBackColor = true;
+            buttonRemoveShip.Click += ButtonRemoveShip_Click;
+            // 
+            // buttonAddCruiser
+            // 
+            buttonAddCruiser.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddCruiser.Location = new Point(19, 106);
+            buttonAddCruiser.Name = "buttonAddCruiser";
+            buttonAddCruiser.Size = new Size(240, 52);
+            buttonAddCruiser.TabIndex = 2;
+            buttonAddCruiser.Text = "Добавление круизера";
+            buttonAddCruiser.UseVisualStyleBackColor = true;
+            buttonAddCruiser.Click += ButtonAddCruiser_Click;
+            // 
+            // maskedTextBox
+            // 
+            maskedTextBox.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            maskedTextBox.Location = new Point(19, 164);
+            maskedTextBox.Mask = "00";
+            maskedTextBox.Name = "maskedTextBox";
+            maskedTextBox.Size = new Size(240, 27);
+            maskedTextBox.TabIndex = 3;
+            maskedTextBox.ValidatingType = typeof(int);
+            // 
+            // panelStorage
+            // 
+            panelStorage.Controls.Add(buttonCollectionDel);
+            panelStorage.Controls.Add(listBoxCollection);
+            panelStorage.Controls.Add(buttonCollectionAdd);
+            panelStorage.Controls.Add(radioButtonList);
+            panelStorage.Controls.Add(radioButtonMassive);
+            panelStorage.Controls.Add(textBoxCollectionName);
+            panelStorage.Controls.Add(labelCollectionName);
+            panelStorage.Dock = DockStyle.Top;
+            panelStorage.Location = new Point(3, 23);
+            panelStorage.Name = "panelStorage";
+            panelStorage.Size = new Size(318, 317);
+            panelStorage.TabIndex = 7;
+            // 
+            // buttonCollectionDel
+            // 
+            buttonCollectionDel.Location = new Point(3, 273);
+            buttonCollectionDel.Name = "buttonCollectionDel";
+            buttonCollectionDel.Size = new Size(306, 29);
+            buttonCollectionDel.TabIndex = 6;
+            buttonCollectionDel.Text = "Удалить коллекцию";
+            buttonCollectionDel.UseVisualStyleBackColor = true;
+            buttonCollectionDel.Click += ButtonCollectionDel_Click;
+            // 
+            // listBoxCollection
+            // 
+            listBoxCollection.FormattingEnabled = true;
+            listBoxCollection.Location = new Point(3, 143);
+            listBoxCollection.Name = "listBoxCollection";
+            listBoxCollection.Size = new Size(306, 124);
+            listBoxCollection.TabIndex = 5;
+            // 
+            // buttonCollectionAdd
+            // 
+            buttonCollectionAdd.Location = new Point(9, 102);
+            buttonCollectionAdd.Name = "buttonCollectionAdd";
+            buttonCollectionAdd.Size = new Size(300, 29);
+            buttonCollectionAdd.TabIndex = 4;
+            buttonCollectionAdd.Text = "Добавить коллекцию";
+            buttonCollectionAdd.UseVisualStyleBackColor = true;
+            buttonCollectionAdd.Click += ButtonCollectionAdd_Click;
+            // 
+            // radioButtonList
+            // 
+            radioButtonList.AutoSize = true;
+            radioButtonList.Location = new Point(97, 72);
+            radioButtonList.Name = "radioButtonList";
+            radioButtonList.Size = new Size(80, 24);
+            radioButtonList.TabIndex = 3;
+            radioButtonList.TabStop = true;
+            radioButtonList.Text = "Список";
+            radioButtonList.UseVisualStyleBackColor = true;
+            // 
+            // radioButtonMassive
+            // 
+            radioButtonMassive.AutoSize = true;
+            radioButtonMassive.Location = new Point(9, 72);
+            radioButtonMassive.Name = "radioButtonMassive";
+            radioButtonMassive.Size = new Size(82, 24);
+            radioButtonMassive.TabIndex = 2;
+            radioButtonMassive.TabStop = true;
+            radioButtonMassive.Text = "Массив";
+            radioButtonMassive.UseVisualStyleBackColor = true;
+            // 
+            // textBoxCollectionName
+            // 
+            textBoxCollectionName.Location = new Point(9, 39);
+            textBoxCollectionName.Name = "textBoxCollectionName";
+            textBoxCollectionName.Size = new Size(300, 27);
+            textBoxCollectionName.TabIndex = 1;
+            // 
+            // labelCollectionName
+            // 
+            labelCollectionName.AutoSize = true;
+            labelCollectionName.Location = new Point(80, 16);
+            labelCollectionName.Name = "labelCollectionName";
+            labelCollectionName.Size = new Size(158, 20);
+            labelCollectionName.TabIndex = 0;
+            labelCollectionName.Text = "Название коллекции:";
+            // 
+            // pictureBoxCollection
+            // 
+            pictureBoxCollection.Dock = DockStyle.Fill;
+            pictureBoxCollection.Location = new Point(0, 0);
+            pictureBoxCollection.Name = "pictureBoxCollection";
+            pictureBoxCollection.Size = new Size(852, 770);
+            pictureBoxCollection.TabIndex = 1;
+            pictureBoxCollection.TabStop = false;
             // 
             // FormShipCollection
             // 
             AutoScaleDimensions = new SizeF(8F, 20F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(1176, 661);
+            ClientSize = new Size(1176, 770);
-            Controls.Add(pictureBox);
+            Controls.Add(pictureBoxCollection);
             Controls.Add(groupBoxTools);
             Name = "FormShipCollection";
             Text = "Коллекция кораблей";
             groupBoxTools.ResumeLayout(false);
-            groupBoxTools.PerformLayout();
+            panelCompanyTools.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
+            panelCompanyTools.PerformLayout();
+            panelStorage.ResumeLayout(false);
+            panelStorage.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxCollection).EndInit();
             ResumeLayout(false);
         }
 
@@ -165,10 +282,20 @@
         private Button buttonAddCruiser;
         private Button buttonAddShip;
         private MaskedTextBox maskedTextBox;
-        private PictureBox pictureBox;
+        private PictureBox pictureBoxCollection;
         private Button buttonRemoveShip;
         private Button buttonRefresh;
         private Button buttonGoToCheck;
         private ComboBox comboBoxSelectorCompany;
+        private Panel panelStorage;
+        private TextBox textBoxCollectionName;
+        private Label labelCollectionName;
+        private ListBox listBoxCollection;
+        private Button buttonCollectionAdd;
+        private RadioButton radioButtonList;
+        private RadioButton radioButtonMassive;
+        private Button buttonCollectionDel;
+        private Button buttonCreateCompany;
+        private Panel panelCompanyTools;
     }
 }

Cruiser/Cruiser/FormShipCollection.cs

@@ -16,9 +16,11 @@ namespace Cruiser;
 
 public partial class FormShipCollection : Form
 {
+    private readonly StorageCollection<DrawingShip> _storageCollection;
     private AbstractCompany? _company = null;
     public FormShipCollection()
     {
+        _storageCollection = new();
         InitializeComponent();
     }
 
@@ -42,10 +44,10 @@ public partial class FormShipCollection : Form
             default:
                 return;
         }
-        if (_company + drawingShip > 0)
+        if (_company + drawingShip >= 0)
         {
             MessageBox.Show("Объект добавлен");
-            pictureBox.Image = _company.Show();
+            pictureBoxCollection.Image = _company.Show();
         }
         else
         {
@@ -69,7 +71,7 @@ public partial class FormShipCollection : Form
         switch (comboBoxSelectorCompany.Text)
         {
             case "Хранилище":
-                _company = new Docs(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects<DrawingShip>());
+                _company = new Docs(pictureBoxCollection.Width, pictureBoxCollection.Height, new MassiveGenericObjects<DrawingShip>());
                 break;
         }
     }
@@ -95,7 +97,7 @@ public partial class FormShipCollection : Form
         if (_company - pos == 1)
         {
             MessageBox.Show("Объект удален");
-            pictureBox.Image = _company.Show();
+            pictureBoxCollection.Image = _company.Show();
         }
         else
         {
@@ -138,6 +140,88 @@ public partial class FormShipCollection : Form
         {
             return;
         }
-        pictureBox.Image = _company.Show();
+        pictureBoxCollection.Image = _company.Show();
+    }
+
+    private void ButtonCollectionAdd_Click(object sender, EventArgs e)
+    {
+        if (string.IsNullOrEmpty(textBoxCollectionName.Text) || (!radioButtonList.Checked && !radioButtonMassive.Checked))
+        {
+            MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            return;
+        }
+
+        CollectionType collectionType = CollectionType.None;
+        if (radioButtonList.Checked)
+        {
+            collectionType = CollectionType.List;
+        }
+        else if (radioButtonMassive.Checked)
+        {
+            collectionType = CollectionType.Massive;
+        }
+        
+
+        _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
+        RefreshListBoxItems();
+    }
+
+    private void ButtonCollectionDel_Click(object sender, EventArgs e)
+    {
+        // TODO прописать логику удаления элемента из коллекции
+        // нужно убедиться, что есть выбранная коллекция
+        // спросить у пользователя через MessageBox, что он подтверждает, что хочет удалить запись
+        // удалить и обновить ListBox
+        if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
+        {
+            MessageBox.Show("Коллекция не выбрана");
+            return;
+        }
+
+        if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+        {
+            return;
+        }
+
+        _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
+        RefreshListBoxItems();
+    }
+    private void RefreshListBoxItems()
+    {
+        listBoxCollection.Items.Clear();
+        for (int i = 0; i < _storageCollection.Keys?.Count; ++i)
+        {
+            string? colName = _storageCollection.Keys?[i];
+            if (!string.IsNullOrEmpty(colName))
+            {
+                listBoxCollection.Items.Add(colName);
+            }
+        }
+    }
+
+    private void ButtonCreateCompany_Click(object sender, EventArgs e)
+    {
+        if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
+        {
+            MessageBox.Show("Коллекция не выбрана");
+            return;
+        }
+        
+        ICollectionGenericObjects<DrawingShip>? collection = _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
+        if (collection == null)
+        {
+            MessageBox.Show("Коллекция не проинициализирована");
+            return;
+        }
+
+        switch (comboBoxSelectorCompany.Text)
+        {
+            case "Хранилище":
+                _company = new Docs(pictureBoxCollection.Width, pictureBoxCollection.Height, collection);
+                break;
+        }
+
+        panelCompanyTools.Enabled = true;
+        RefreshListBoxItems();
     }
 }