ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/CollectionType.cs

@@ -1,28 +0,0 @@
-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/ListGenericObjects.cs

@@ -1,126 +0,0 @@
-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

@@ -52,7 +52,15 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
 
     public int Insert(T obj)
     {
-        return Insert(obj, 0);
+        for (int i = 0; i < Count; i++)
+        {
+            if (_collection[i] == null)
+            {
+                _collection[i] = obj;
+                return i;
+            }
+        }
+        return -1;
     }
 
     public int Insert(T obj, int position)

ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/ShipSharingService.cs

@@ -18,6 +18,11 @@ 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

@@ -1,87 +0,0 @@
-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,216 +29,101 @@
         private void InitializeComponent()
         {
             groupBoxTools = new GroupBox();
-            panelCompanyTools = new Panel();
-            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();
+            buttonDelShip = new Button();
+            maskedTextBoxPosition = new MaskedTextBox();
+            buttonAddContainerShip = new Button();
+            buttonAddShip = new Button();
             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(panelCompanyTools);
-            groupBoxTools.Controls.Add(buttonCreateCompany);
-            groupBoxTools.Controls.Add(panelStorage);
+            groupBoxTools.Controls.Add(buttonRefresh);
+            groupBoxTools.Controls.Add(buttonGoToCheck);
+            groupBoxTools.Controls.Add(buttonDelShip);
+            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, 638);
+            groupBoxTools.Size = new Size(206, 617);
             groupBoxTools.TabIndex = 0;
             groupBoxTools.TabStop = false;
             groupBoxTools.Text = "Инструменты";
             // 
-            // panelCompanyTools
-            // 
-            panelCompanyTools.Controls.Add(buttonAddShip);
-            panelCompanyTools.Controls.Add(buttonAddContainerShip);
-            panelCompanyTools.Controls.Add(maskedTextBoxPosition);
-            panelCompanyTools.Controls.Add(buttonRefresh);
-            panelCompanyTools.Controls.Add(buttonDelShip);
-            panelCompanyTools.Controls.Add(buttonGoToCheck);
-            panelCompanyTools.Enabled = false;
-            panelCompanyTools.Location = new Point(6, 386);
-            panelCompanyTools.Name = "panelCompanyTools";
-            panelCompanyTools.Size = new Size(197, 246);
-            panelCompanyTools.TabIndex = 9;
-            // 
-            // buttonAddShip
-            // 
-            buttonAddShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonAddShip.Location = new Point(3, 12);
-            buttonAddShip.Name = "buttonAddShip";
-            buttonAddShip.Size = new Size(191, 34);
-            buttonAddShip.TabIndex = 1;
-            buttonAddShip.Text = "Добавление корабля";
-            buttonAddShip.UseVisualStyleBackColor = true;
-            buttonAddShip.Click += ButtonAddShip_Click;
-            // 
-            // buttonAddContainerShip
-            // 
-            buttonAddContainerShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonAddContainerShip.Location = new Point(3, 52);
-            buttonAddContainerShip.Name = "buttonAddContainerShip";
-            buttonAddContainerShip.Size = new Size(191, 34);
-            buttonAddContainerShip.TabIndex = 2;
-            buttonAddContainerShip.Text = "Добавление контейнеровоза";
-            buttonAddContainerShip.UseVisualStyleBackColor = true;
-            buttonAddContainerShip.Click += ButtonAddContainerShip_Click;
-            // 
-            // maskedTextBoxPosition
-            // 
-            maskedTextBoxPosition.Location = new Point(3, 92);
-            maskedTextBoxPosition.Mask = "00";
-            maskedTextBoxPosition.Name = "maskedTextBoxPosition";
-            maskedTextBoxPosition.Size = new Size(194, 25);
-            maskedTextBoxPosition.TabIndex = 3;
-            maskedTextBoxPosition.ValidatingType = typeof(int);
-            // 
             // buttonRefresh
             // 
             buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRefresh.Location = new Point(3, 206);
+            buttonRefresh.Location = new Point(6, 482);
             buttonRefresh.Name = "buttonRefresh";
             buttonRefresh.RightToLeft = RightToLeft.No;
-            buttonRefresh.Size = new Size(191, 34);
+            buttonRefresh.Size = new Size(194, 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.Location = new Point(6, 367);
             buttonGoToCheck.Name = "buttonGoToCheck";
             buttonGoToCheck.RightToLeft = RightToLeft.No;
-            buttonGoToCheck.Size = new Size(191, 34);
+            buttonGoToCheck.Size = new Size(194, 34);
             buttonGoToCheck.TabIndex = 5;
             buttonGoToCheck.Text = "Передать на тесты";
             buttonGoToCheck.UseVisualStyleBackColor = true;
             buttonGoToCheck.Click += ButtonGoToCheck_Click;
             // 
-            // buttonCreateCompany
+            // buttonDelShip
             // 
-            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;
+            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;
             // 
-            // panelStorage
+            // maskedTextBoxPosition
             // 
-            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;
+            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);
             // 
-            // buttonCollectionDel
+            // buttonAddContainerShip
             // 
-            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;
+            buttonAddContainerShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddContainerShip.Location = new Point(6, 134);
+            buttonAddContainerShip.Name = "buttonAddContainerShip";
+            buttonAddContainerShip.Size = new Size(194, 34);
+            buttonAddContainerShip.TabIndex = 2;
+            buttonAddContainerShip.Text = "Добавление контейнеровоза";
+            buttonAddContainerShip.UseVisualStyleBackColor = true;
+            buttonAddContainerShip.Click += ButtonAddContainerShip_Click;
             // 
-            // listBoxCollection
+            // buttonAddShip
             // 
-            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 = "Название коллекции:";
+            buttonAddShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddShip.Location = new Point(6, 94);
+            buttonAddShip.Name = "buttonAddShip";
+            buttonAddShip.Size = new Size(194, 34);
+            buttonAddShip.TabIndex = 1;
+            buttonAddShip.Text = "Добавление корабля";
+            buttonAddShip.UseVisualStyleBackColor = true;
+            buttonAddShip.Click += ButtonAddShip_Click;
             // 
             // comboBoxSelectorCompany
             // 
@@ -246,7 +131,7 @@
             comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
             comboBoxSelectorCompany.FormattingEnabled = true;
             comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
-            comboBoxSelectorCompany.Location = new Point(6, 322);
+            comboBoxSelectorCompany.Location = new Point(6, 24);
             comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
             comboBoxSelectorCompany.Size = new Size(194, 25);
             comboBoxSelectorCompany.TabIndex = 0;
@@ -257,7 +142,7 @@
             pictureBox.Dock = DockStyle.Fill;
             pictureBox.Location = new Point(0, 0);
             pictureBox.Name = "pictureBox";
-            pictureBox.Size = new Size(930, 638);
+            pictureBox.Size = new Size(930, 617);
             pictureBox.TabIndex = 1;
             pictureBox.TabStop = false;
             // 
@@ -265,16 +150,13 @@
             // 
             AutoScaleDimensions = new SizeF(7F, 17F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(1136, 638);
+            ClientSize = new Size(1136, 617);
             Controls.Add(pictureBox);
             Controls.Add(groupBoxTools);
             Name = "FormShipCollection";
             Text = "Коллекция кораблей";
             groupBoxTools.ResumeLayout(false);
-            panelCompanyTools.ResumeLayout(false);
-            panelCompanyTools.PerformLayout();
-            panelStorage.ResumeLayout(false);
-            panelStorage.PerformLayout();
+            groupBoxTools.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
             ResumeLayout(false);
         }
@@ -290,15 +172,6 @@
         private Button buttonDelShip;
         private Button buttonRefresh;
         private Button buttonGoToCheck;
-        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;
+        private ColorDialog colorDialog;
     }
 }

ProjectContainerShip/ProjectContainerShip/FormShipCollection.cs

@@ -14,18 +14,12 @@ namespace ProjectContainerShip
         /// </summary>
         private AbstractCompany? _company;
 
-        /// <summary>
-        /// Хранилище коллекций
-        /// </summary>
-        private readonly StorageCollection<DrawningShip> _storageCollection;
-
         /// <summary>
         /// Конструктор
         /// </summary>
         public FormShipCollection()
         {
             InitializeComponent();
-            _storageCollection = new();
         }
 
         /// <summary>
@@ -35,10 +29,14 @@ namespace ProjectContainerShip
         /// <param name="e"></param>
         private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
         {
-            panelCompanyTools.Enabled = false;
+            switch (comboBoxSelectorCompany.Text)
+            {
+                case "Хранилище":
+                    _company = new ShipSharingService(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects<DrawningShip>());
+                    break;
+            }
         }
 
-
         /// <summary>
         /// Создание объекта класса-перемещения
         /// </summary>
@@ -187,98 +185,5 @@ 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,6 +117,9 @@
   <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>