выполненно доп задание(потом удалить в ListGenericObjects)

ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/AbstractCompany.cs

@@ -56,9 +56,9 @@ public abstract class AbstractCompany
     /// <param name="company">Компания</param>
     /// <param name="ship">Добавляемый объект</param>
     /// <returns></returns>
-    public static int operator +(AbstractCompany company, DrawningShip boat)
+    public static bool operator +(AbstractCompany company, DrawningShip boat)
     {
-        return company._collection?.Insert(boat) ?? -1;
+        return company._collection?.Insert(boat) ?? false;
     }
 
     /// <summary>
@@ -67,9 +67,9 @@ public abstract class AbstractCompany
     /// <param name="company">Компания</param>
     /// <param name="position">Номер удаляемого объекта</param>
     /// <returns></returns>
-    public static DrawningShip operator -(AbstractCompany company, int position)
+    public static bool operator -(AbstractCompany company, int position)
     {
-        return company._collection?.Remove(position) ?? null;
+        return company._collection?.Remove(position) ?? false;
     }
 
     /// <summary>

ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/CollectionType.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectContainerShip.CollectionGenericObjects;
+
+/// <summary>
+/// Тип коллекции
+/// </summary>
+public enum CollectionType
+{
+    /// <summary>
+    /// Неопределено
+    /// </summary>
+    None = 0,
+
+    /// <summary>
+    /// Масссив
+    /// </summary>
+    Massive = 1,
+
+    /// <summary>
+    /// Список
+    /// </summary>
+    List = 2
+}

ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -19,7 +19,7 @@ public interface ICollectionGenericObjects <T>
     /// </summary>
     /// <param name="obj">Добавляемый объект</param>
     /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
-    int Insert (T obj);
+    bool Insert (T obj);
 
     /// <summary>
     /// Добавление объекта в коллекцию на конкретную позицию
@@ -27,14 +27,14 @@ public interface ICollectionGenericObjects <T>
     /// /// <param name="obj">Добавляемый объект</param>
     /// /// <param name="position">Позиция</param>
     /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
-    int Insert (T obj, int position);
+    bool Insert (T obj, int position);
 
     /// <summary>
     /// Удаление объекта из коллекции с конктретной позиции
     /// </summary>
     /// /// <param name="obj">Добавляемый объект</param>
     /// <returns>true - удаление прошло удачно, false - удаление не удалось</returns>
-    T Remove (int position);
+    bool Remove (int position);
 
     /// <summary>
     /// Получение объекта по позиции

ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/ListGenericObjects.cs

@@ -0,0 +1,121 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectContainerShip.CollectionGenericObjects;
+
+/// <summary>
+/// Параметризованный набор объектов
+/// </summary>
+/// <typeparam name="T">Параметр: ограничение - ссылочный тип</typeparam>
+public class ListGenericObjects<T> : ICollectionGenericObjects<T>
+    where T : class
+{
+    /// <summary>
+	/// Список объектов, которые храним
+	/// </summary>
+	//private readonly List<T?> _collection;
+    private readonly Dictionary<int, 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();
+        _collection = new Dictionary<int, T?>();
+    }
+
+    public T? Get(int position)
+    {
+        if (position >= 0 && position < Count)
+        {
+            return _collection[position];
+        }
+        else
+        {
+            return null;
+        }
+
+    }
+    public bool Insert(T obj)
+    {
+        if (Count == _maxCount) { return false; }
+        //_collection.Add(obj);
+        //return true;
+        
+        //допка
+        int position = FindFirstNullPosition();
+        if (position == -1)
+        {
+            return false; 
+        }
+
+        _collection[position] = obj;
+        return true;
+    }
+
+    public bool Insert(T obj, int position)
+    {
+        //if (position < 0 || position >= Count || Count == _maxCount)
+        //{
+        //    return false;
+        //}
+        //_collection.Insert(position, obj);
+
+        //return false;
+
+        //допка
+        if (position < 0 || position >= _maxCount || Count == _maxCount || _collection.ContainsKey(position))
+        {
+            return false;
+        }
+
+        _collection[position] = obj;
+        return true;
+    }
+
+    public bool Remove(int position)
+    {
+        //    if (position < 0 || position >= Count)
+        //    {
+        //        return false;
+        //    }
+        //    _collection.RemoveAt(position);
+        //    return true;
+        if (!_collection.ContainsKey(position))
+        {
+            return false;
+        }
+
+        _collection.Remove(position);
+        return true;
+    }
+    /// <summary>
+    /// Находит первую пустую позицию в словаре
+    /// </summary>
+    /// <returns>Индекс первой пустой позиции или -1, если такой не найдено</returns>
+    private int FindFirstNullPosition()
+    {
+        for (int i = 0; i < _maxCount; i++)
+        {
+            if (!_collection.ContainsKey(i) || _collection[i] == null)
+            {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+}

ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -50,29 +50,29 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
         return null;
     }
 
-    public int Insert(T obj)
+    public bool Insert(T obj)
     {
         for (int i = 0; i < Count; i++)
         {
             if (_collection[i] == null)
             {
                 _collection[i] = obj;
-                return i;
+                return true;
             }
         }
-        return -1;
+        return false;
     }
 
-    public int Insert(T obj, int position)
+    public bool Insert(T obj, int position)
     {
         if (position < 0 || position >= Count)
         {
-            return -1;
+            return false;
         }
         if (_collection[position] == null)
         {
             _collection[position] = obj;
-            return position;
+            return true;
         }
 
         for (int i = position + 1; i < Count; i++)
@@ -80,7 +80,7 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
             if (_collection[i] == null)
             {
                 _collection[i] = obj;
-                return i;
+                return true;
             }
         }
         for (int i = position - 1; i >= 0; i--)
@@ -88,21 +88,21 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
             if (_collection[i] == null)
             {
                 _collection[i] = obj;
-                return i;
+                return true;
             }
         }
 
-        return -1;
+        return false;
     }
 
-    public T Remove(int position)
+    public bool Remove(int position)
     {
         if (position < 0 || position >= Count)
         {
-            return null;
+            return false;
         }
         T obj = _collection[position];
         _collection[position] = null;
-        return obj;
+        return true;
     }
 }

ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/ShipSharingService.cs

@@ -18,11 +18,6 @@ public class ShipSharingService : AbstractCompany
 
     protected override void DrawBackground(Graphics g)
     {
-        //Color backgroundColor = Color.SkyBlue;
-        //using (Brush brush = new SolidBrush(backgroundColor))
-        //{
-        //    g.FillRectangle(brush, new Rectangle(0, 0, _pictureWidth, _pictureHeight));
-        //}
         Pen pen = new Pen(Color.Brown, 3);
         int offsetX = 10, offsetY = -12;
         int x = 1 + offsetX, y = _pictureHeight - _placeSizeHeight + offsetY;

ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/StorageCollection.cs

@@ -0,0 +1,87 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectContainerShip.CollectionGenericObjects;
+
+/// <summary>
+/// Класс - хранилище коллекций
+/// </summary>
+/// <typeparam name="T"></typeparam>
+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 (string.IsNullOrEmpty(name) || _storages.ContainsKey(name))
+        {
+            return;
+        }
+        switch (collectionType)
+        {
+            case CollectionType.Massive:
+                _storages[name] = new MassiveGenericObjects<T>();
+                break;
+            case CollectionType.List:
+                _storages[name] = new ListGenericObjects<T>();
+                break;
+            default:
+                return;
+        }
+    }
+
+    /// <summary>
+    /// Удаление коллекции
+    /// </summary>
+    /// <param name="name">Название коллекции</param>
+    public void DelCollection(string name)
+    {
+        if (_storages.ContainsKey(name))
+        {
+            _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;
+        }
+    }
+}

ProjectContainerShip/ProjectContainerShip/FormShipCollection.Designer.cs

@@ -29,101 +29,216 @@
         private void InitializeComponent()
         {
             groupBoxTools = new GroupBox();
-            buttonRefresh = new Button();
+            panelCompanyTools = new Panel();
-            buttonGoToCheck = new Button();
-            buttonDelShip = new Button();
-            maskedTextBoxPosition = new MaskedTextBox();
-            buttonAddContainerShip = new Button();
             buttonAddShip = new Button();
+            buttonAddContainerShip = new Button();
+            maskedTextBoxPosition = new MaskedTextBox();
+            buttonRefresh = new Button();
+            buttonDelShip = new Button();
+            buttonGoToCheck = new Button();
+            buttonCreateCompany = new Button();
+            panelStorage = new Panel();
+            buttonCollectionDel = new Button();
+            listBoxCollection = new ListBox();
+            buttonCollectionAdd = new Button();
+            radioButtonList = new RadioButton();
+            radioButtonMassive = new RadioButton();
+            textBoxCollectionName = new TextBox();
+            labelCollectionName = new Label();
             comboBoxSelectorCompany = new ComboBox();
             pictureBox = new PictureBox();
-            colorDialog = new ColorDialog();
             groupBoxTools.SuspendLayout();
+            panelCompanyTools.SuspendLayout();
+            panelStorage.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
             SuspendLayout();
             // 
             // groupBoxTools
             // 
-            groupBoxTools.Controls.Add(buttonRefresh);
+            groupBoxTools.Controls.Add(panelCompanyTools);
-            groupBoxTools.Controls.Add(buttonGoToCheck);
+            groupBoxTools.Controls.Add(buttonCreateCompany);
-            groupBoxTools.Controls.Add(buttonDelShip);
+            groupBoxTools.Controls.Add(panelStorage);
-            groupBoxTools.Controls.Add(maskedTextBoxPosition);
-            groupBoxTools.Controls.Add(buttonAddContainerShip);
-            groupBoxTools.Controls.Add(buttonAddShip);
             groupBoxTools.Controls.Add(comboBoxSelectorCompany);
             groupBoxTools.Dock = DockStyle.Right;
             groupBoxTools.Location = new Point(930, 0);
             groupBoxTools.Name = "groupBoxTools";
-            groupBoxTools.Size = new Size(206, 617);
+            groupBoxTools.Size = new Size(206, 638);
             groupBoxTools.TabIndex = 0;
             groupBoxTools.TabStop = false;
             groupBoxTools.Text = "Инструменты";
             // 
-            // buttonRefresh
+            // panelCompanyTools
             // 
-            buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            panelCompanyTools.Controls.Add(buttonAddShip);
-            buttonRefresh.Location = new Point(6, 482);
+            panelCompanyTools.Controls.Add(buttonAddContainerShip);
-            buttonRefresh.Name = "buttonRefresh";
+            panelCompanyTools.Controls.Add(maskedTextBoxPosition);
-            buttonRefresh.RightToLeft = RightToLeft.No;
+            panelCompanyTools.Controls.Add(buttonRefresh);
-            buttonRefresh.Size = new Size(194, 34);
+            panelCompanyTools.Controls.Add(buttonDelShip);
-            buttonRefresh.TabIndex = 6;
+            panelCompanyTools.Controls.Add(buttonGoToCheck);
-            buttonRefresh.Text = "Обновить";
+            panelCompanyTools.Enabled = false;
-            buttonRefresh.UseVisualStyleBackColor = true;
+            panelCompanyTools.Location = new Point(6, 386);
+            panelCompanyTools.Name = "panelCompanyTools";
+            panelCompanyTools.Size = new Size(197, 246);
+            panelCompanyTools.TabIndex = 9;
             // 
-            // buttonGoToCheck
+            // buttonAddShip
             // 
-            buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonGoToCheck.Location = new Point(6, 367);
+            buttonAddShip.Location = new Point(3, 12);
-            buttonGoToCheck.Name = "buttonGoToCheck";
+            buttonAddShip.Name = "buttonAddShip";
-            buttonGoToCheck.RightToLeft = RightToLeft.No;
+            buttonAddShip.Size = new Size(191, 34);
-            buttonGoToCheck.Size = new Size(194, 34);
+            buttonAddShip.TabIndex = 1;
-            buttonGoToCheck.TabIndex = 5;
+            buttonAddShip.Text = "Добавление корабля";
-            buttonGoToCheck.Text = "Передать на тесты";
+            buttonAddShip.UseVisualStyleBackColor = true;
-            buttonGoToCheck.UseVisualStyleBackColor = true;
+            buttonAddShip.Click += ButtonAddShip_Click;
-            buttonGoToCheck.Click += ButtonGoToCheck_Click;
-            // 
-            // buttonDelShip
-            // 
-            buttonDelShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonDelShip.Location = new Point(6, 234);
-            buttonDelShip.Name = "buttonDelShip";
-            buttonDelShip.RightToLeft = RightToLeft.No;
-            buttonDelShip.Size = new Size(194, 34);
-            buttonDelShip.TabIndex = 4;
-            buttonDelShip.Text = "Удалить";
-            buttonDelShip.UseVisualStyleBackColor = true;
-            buttonDelShip.Click += ButtonDelShip_Click;
-            // 
-            // maskedTextBoxPosition
-            // 
-            maskedTextBoxPosition.Location = new Point(6, 203);
-            maskedTextBoxPosition.Mask = "00";
-            maskedTextBoxPosition.Name = "maskedTextBoxPosition";
-            maskedTextBoxPosition.Size = new Size(188, 25);
-            maskedTextBoxPosition.TabIndex = 3;
-            maskedTextBoxPosition.ValidatingType = typeof(int);
             // 
             // buttonAddContainerShip
             // 
             buttonAddContainerShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonAddContainerShip.Location = new Point(6, 134);
+            buttonAddContainerShip.Location = new Point(3, 52);
             buttonAddContainerShip.Name = "buttonAddContainerShip";
-            buttonAddContainerShip.Size = new Size(194, 34);
+            buttonAddContainerShip.Size = new Size(191, 34);
             buttonAddContainerShip.TabIndex = 2;
             buttonAddContainerShip.Text = "Добавление контейнеровоза";
             buttonAddContainerShip.UseVisualStyleBackColor = true;
             buttonAddContainerShip.Click += ButtonAddContainerShip_Click;
             // 
-            // buttonAddShip
+            // maskedTextBoxPosition
             // 
-            buttonAddShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            maskedTextBoxPosition.Location = new Point(3, 92);
-            buttonAddShip.Location = new Point(6, 94);
+            maskedTextBoxPosition.Mask = "00";
-            buttonAddShip.Name = "buttonAddShip";
+            maskedTextBoxPosition.Name = "maskedTextBoxPosition";
-            buttonAddShip.Size = new Size(194, 34);
+            maskedTextBoxPosition.Size = new Size(194, 25);
-            buttonAddShip.TabIndex = 1;
+            maskedTextBoxPosition.TabIndex = 3;
-            buttonAddShip.Text = "Добавление корабля";
+            maskedTextBoxPosition.ValidatingType = typeof(int);
-            buttonAddShip.UseVisualStyleBackColor = true;
+            // 
-            buttonAddShip.Click += ButtonAddShip_Click;
+            // buttonRefresh
+            // 
+            buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRefresh.Location = new Point(3, 206);
+            buttonRefresh.Name = "buttonRefresh";
+            buttonRefresh.RightToLeft = RightToLeft.No;
+            buttonRefresh.Size = new Size(191, 34);
+            buttonRefresh.TabIndex = 6;
+            buttonRefresh.Text = "Обновить";
+            buttonRefresh.UseVisualStyleBackColor = true;
+            buttonRefresh.Click += ButtonRefresh_Click;
+            // 
+            // buttonDelShip
+            // 
+            buttonDelShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonDelShip.Location = new Point(3, 123);
+            buttonDelShip.Name = "buttonDelShip";
+            buttonDelShip.RightToLeft = RightToLeft.No;
+            buttonDelShip.Size = new Size(191, 34);
+            buttonDelShip.TabIndex = 4;
+            buttonDelShip.Text = "Удалить";
+            buttonDelShip.UseVisualStyleBackColor = true;
+            buttonDelShip.Click += ButtonDelShip_Click;
+            // 
+            // buttonGoToCheck
+            // 
+            buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonGoToCheck.Location = new Point(3, 163);
+            buttonGoToCheck.Name = "buttonGoToCheck";
+            buttonGoToCheck.RightToLeft = RightToLeft.No;
+            buttonGoToCheck.Size = new Size(191, 34);
+            buttonGoToCheck.TabIndex = 5;
+            buttonGoToCheck.Text = "Передать на тесты";
+            buttonGoToCheck.UseVisualStyleBackColor = true;
+            buttonGoToCheck.Click += ButtonGoToCheck_Click;
+            // 
+            // buttonCreateCompany
+            // 
+            buttonCreateCompany.Location = new Point(6, 357);
+            buttonCreateCompany.Name = "buttonCreateCompany";
+            buttonCreateCompany.Size = new Size(194, 23);
+            buttonCreateCompany.TabIndex = 8;
+            buttonCreateCompany.Text = "Создать компанию";
+            buttonCreateCompany.UseVisualStyleBackColor = true;
+            buttonCreateCompany.Click += ButtonCreateCompany_Click;
+            // 
+            // 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, 21);
+            panelStorage.Name = "panelStorage";
+            panelStorage.Size = new Size(200, 297);
+            panelStorage.TabIndex = 7;
+            // 
+            // buttonCollectionDel
+            // 
+            buttonCollectionDel.Location = new Point(3, 272);
+            buttonCollectionDel.Name = "buttonCollectionDel";
+            buttonCollectionDel.Size = new Size(194, 23);
+            buttonCollectionDel.TabIndex = 6;
+            buttonCollectionDel.Text = "Удалить коллекцию";
+            buttonCollectionDel.UseVisualStyleBackColor = true;
+            buttonCollectionDel.Click += ButtonCollectionDel_Click;
+            // 
+            // listBoxCollection
+            // 
+            listBoxCollection.FormattingEnabled = true;
+            listBoxCollection.ItemHeight = 17;
+            listBoxCollection.Location = new Point(3, 126);
+            listBoxCollection.Name = "listBoxCollection";
+            listBoxCollection.Size = new Size(194, 140);
+            listBoxCollection.TabIndex = 5;
+            // 
+            // buttonCollectionAdd
+            // 
+            buttonCollectionAdd.Location = new Point(3, 89);
+            buttonCollectionAdd.Name = "buttonCollectionAdd";
+            buttonCollectionAdd.Size = new Size(194, 31);
+            buttonCollectionAdd.TabIndex = 4;
+            buttonCollectionAdd.Text = "Добавить коллекцию";
+            buttonCollectionAdd.UseVisualStyleBackColor = true;
+            buttonCollectionAdd.Click += ButtonCollectionAdd_Click;
+            // 
+            // radioButtonList
+            // 
+            radioButtonList.AutoSize = true;
+            radioButtonList.Location = new Point(120, 70);
+            radioButtonList.Name = "radioButtonList";
+            radioButtonList.Size = new Size(68, 21);
+            radioButtonList.TabIndex = 3;
+            radioButtonList.TabStop = true;
+            radioButtonList.Text = "Список";
+            radioButtonList.UseVisualStyleBackColor = true;
+            // 
+            // radioButtonMassive
+            // 
+            radioButtonMassive.AutoSize = true;
+            radioButtonMassive.Location = new Point(25, 70);
+            radioButtonMassive.Name = "radioButtonMassive";
+            radioButtonMassive.Size = new Size(71, 21);
+            radioButtonMassive.TabIndex = 2;
+            radioButtonMassive.TabStop = true;
+            radioButtonMassive.Text = "Массив";
+            radioButtonMassive.UseVisualStyleBackColor = true;
+            // 
+            // textBoxCollectionName
+            // 
+            textBoxCollectionName.Location = new Point(3, 39);
+            textBoxCollectionName.Name = "textBoxCollectionName";
+            textBoxCollectionName.Size = new Size(194, 25);
+            textBoxCollectionName.TabIndex = 1;
+            // 
+            // labelCollectionName
+            // 
+            labelCollectionName.AutoSize = true;
+            labelCollectionName.Location = new Point(39, 9);
+            labelCollectionName.Name = "labelCollectionName";
+            labelCollectionName.Size = new Size(134, 17);
+            labelCollectionName.TabIndex = 0;
+            labelCollectionName.Text = "Название коллекции:";
             // 
             // comboBoxSelectorCompany
             // 
@@ -131,7 +246,7 @@
             comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
             comboBoxSelectorCompany.FormattingEnabled = true;
             comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
-            comboBoxSelectorCompany.Location = new Point(6, 24);
+            comboBoxSelectorCompany.Location = new Point(6, 322);
             comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
             comboBoxSelectorCompany.Size = new Size(194, 25);
             comboBoxSelectorCompany.TabIndex = 0;
@@ -142,7 +257,7 @@
             pictureBox.Dock = DockStyle.Fill;
             pictureBox.Location = new Point(0, 0);
             pictureBox.Name = "pictureBox";
-            pictureBox.Size = new Size(930, 617);
+            pictureBox.Size = new Size(930, 638);
             pictureBox.TabIndex = 1;
             pictureBox.TabStop = false;
             // 
@@ -150,13 +265,16 @@
             // 
             AutoScaleDimensions = new SizeF(7F, 17F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(1136, 617);
+            ClientSize = new Size(1136, 638);
             Controls.Add(pictureBox);
             Controls.Add(groupBoxTools);
             Name = "FormShipCollection";
             Text = "Коллекция кораблей";
             groupBoxTools.ResumeLayout(false);
-            groupBoxTools.PerformLayout();
+            panelCompanyTools.ResumeLayout(false);
+            panelCompanyTools.PerformLayout();
+            panelStorage.ResumeLayout(false);
+            panelStorage.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
             ResumeLayout(false);
         }
@@ -172,6 +290,15 @@
         private Button buttonDelShip;
         private Button buttonRefresh;
         private Button buttonGoToCheck;
-        private ColorDialog colorDialog;
+        private Panel panelStorage;
+        private RadioButton radioButtonList;
+        private RadioButton radioButtonMassive;
+        private TextBox textBoxCollectionName;
+        private Label labelCollectionName;
+        private Button buttonCreateCompany;
+        private Button buttonCollectionDel;
+        private ListBox listBoxCollection;
+        private Button buttonCollectionAdd;
+        private Panel panelCompanyTools;
     }
 }

ProjectContainerShip/ProjectContainerShip/FormShipCollection.cs

@@ -14,12 +14,18 @@ namespace ProjectContainerShip
         /// </summary>
         private AbstractCompany? _company;
 
+        /// <summary>
+        /// Хранилище коллекций
+        /// </summary>
+        private readonly StorageCollection<DrawningShip> _storageCollection;
+
         /// <summary>
         /// Конструктор
         /// </summary>
         public FormShipCollection()
         {
             InitializeComponent();
+            _storageCollection = new();
         }
 
         /// <summary>
@@ -29,12 +35,7 @@ namespace ProjectContainerShip
         /// <param name="e"></param>
         private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
         {
-            switch (comboBoxSelectorCompany.Text)
+            panelCompanyTools.Enabled = false;
-            {
-                case "Хранилище":
-                    _company = new ShipSharingService(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects<DrawningShip>());
-                    break;
-            }
         }
 
         /// <summary>
@@ -64,7 +65,7 @@ namespace ProjectContainerShip
                     return;
 
             }
-            if (_company + _drawningShip != -1)
+            if (_company + _drawningShip)
             {
                 MessageBox.Show("Объект добавлен");
                 pictureBox.Image = _company.Show();
@@ -185,5 +186,98 @@ namespace ProjectContainerShip
             pictureBox.Image = _company.Show();
         }
 
+        /// <summary>
+        /// Добавление коллекции
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        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 (radioButtonMassive.Checked)
+            {
+                collectionType = CollectionType.Massive;
+            }
+            else if (radioButtonList.Checked)
+            {
+                collectionType = CollectionType.List;
+            }
+
+            _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
+            RefreshListBoxItems();
+        }
+
+        /// <summary>
+        /// Обновление списка в listBoxCollection
+        /// </summary>
+        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);
+                }
+            }
+
+        }
+
+        /// <summary>
+        /// Удаление коллекции
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonCollectionDel_Click(object sender, EventArgs e)
+        {
+            if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItems == null)
+            {
+                MessageBox.Show("Коллекция не выбрана");
+                return;
+            }
+            if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+            {
+                return;
+            }
+            _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
+            RefreshListBoxItems();
+        }
+
+        /// <summary>
+        /// Создание компании
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonCreateCompany_Click(object sender, EventArgs e)
+        {
+            if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
+            {
+                MessageBox.Show("Коллекция не выбрана");
+                return;
+            }
+
+            ICollectionGenericObjects<DrawningShip>? collection = _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
+            if (collection == null)
+            {
+                MessageBox.Show("Коллекция не проинициализирована");
+                return;
+            }
+
+            switch (comboBoxSelectorCompany.Text)
+            {
+                case "Хранилище":
+                    _company = new ShipSharingService(pictureBox.Width, pictureBox.Height, collection);
+                    break;
+            }
+
+            panelCompanyTools.Enabled = true;
+            RefreshListBoxItems();
+        }
     }
 }

ProjectContainerShip/ProjectContainerShip/FormShipCollection.resx

@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="colorDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>79</value>
   </metadata>