Cruiser/Cruiser/CollectionGenericObjects/AbstractCompany.cs

@@ -50,7 +50,7 @@ public abstract class AbstractCompany
         _pictureWidth = picWidth;
         _pictureHeight = picHeight;
         _collection = collection;
-        _collection.MaxCount = GetMaxCount;
+        _collection.SetMaxCount = GetMaxCount;
     }
 
     /// <summary>

Cruiser/Cruiser/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -14,10 +14,7 @@ public interface ICollectionGenericObjects<T>
     /// </summary>
     int Count { get; }
 
-    /// <summary>
-    /// Установка максимального количества элементов
-    /// </summary>
-    int MaxCount { get; set; }
+    int SetMaxCount { set; }
 
     /// <summary>
     /// Добавление объекта в коллекцию
@@ -47,15 +44,4 @@ public interface ICollectionGenericObjects<T>
     /// <param name="position"></param>
     /// <returns></returns>
     T? Get(int position);
-
-    /// <summary>
-    /// Получение типа коллекции
-    /// </summary>
-    CollectionType GetCollectionType { get; }
-
-    /// <summary>
-    /// Получение объектов коллекции по одному
-    /// </summary>
-    /// <returns>Поэлементый вывод элементов коллекции</returns>
-    IEnumerable<T?> GetItems();
 }

Cruiser/Cruiser/CollectionGenericObjects/ListGenericObjects.cs

@@ -21,23 +21,7 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
 
     public int Count => _collection.Count;
 
-    public int MaxCount
-    {
-        get
-        {
-            return _collection.Count;
-        }
-        set
-        {
-            if (value > 0)
-            {
-                _maxCount = value;
-            }
-        }
-    }
-
-
-    public CollectionType GetCollectionType => CollectionType.List;
+    public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } }
 
     /// <summary>
     /// Конструктор
@@ -49,6 +33,7 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
 
     public T? Get(int position)
     {
+        // TODO проверка позиции
         if (position < 0 || position >= Count)
         {
             return null;
@@ -68,6 +53,9 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
 
     public int Insert(T obj, int position)
     {
+        // TODO проверка, что не превышено максимальное количество элементов
+        // TODO проверка позиции
+        // TODO вставка по позиции
         if (Count == _maxCount)
         {
             return -1;
@@ -82,17 +70,14 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
 
     public T Remove(int position)
     {
-        if (position >= Count || position < 0) return null;
-        T temp = _collection[position];
-        _collection.RemoveAt(position);
-        return temp;
-    }
-
-    public IEnumerable<T?> GetItems()
-    {
-        for (int i = 0; i < _collection.Count; ++i)
+        // TODO проверка позиции
+        // TODO удаление объекта из списка
+        if (position >= Count || position < 0)
         {
-            yield return _collection[i];
+            return null;
         }
+        T obj = _collection[position];
+        _collection.RemoveAt(position);
+        return obj;
     }
 }

Cruiser/Cruiser/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -11,14 +11,11 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
     where T : class
 {
     private T?[] _collection;
+
     public int Count => _collection.Length;
 
-    public int MaxCount
+    public int SetMaxCount
     {
-        get
-        {
-            return _collection.Length;
-        }
         set
         {
             if (value > 0)
@@ -35,10 +32,6 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
         }
     }
 
-    public CollectionType GetCollectionType => CollectionType.Massive;
-
-    
-
     public MassiveGenericObjects()
     {
         _collection = Array.Empty<T?>();
@@ -104,14 +97,6 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
         _collection[position] = null;
         return obj;
     }
-
-    public IEnumerable<T?> GetItems()
-    {
-        for (int i = 0; i < _collection.Length; ++i)
-        {
-            yield return _collection[i];
-        }
-    }
 }
 
 

Cruiser/Cruiser/CollectionGenericObjects/StorageCollection.cs

@@ -3,37 +3,21 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Cruiser.Drawings;
-using Cruiser.Entities;
+
 namespace Cruiser.CollectionGenericObjects;
 
-public class StorageCollection<T> where T : DrawingShip
+public class StorageCollection<T> where T : class
 {
     /// <summary>
-	/// Словарь (хранилище) с коллекциями
-	/// </summary>
-	readonly Dictionary<string, ICollectionGenericObjects<T>> _storages;
+    /// Словарь хранилище с коллекциями
+    /// </summary>
+    readonly Dictionary<string, ICollectionGenericObjects<T>> _storages;
 
     /// <summary>
-    /// Возвращение списка названий коллекций
+    /// Возвращение списка названия коллекций
     /// </summary>
     public List<string> Keys => _storages.Keys.ToList();
 
-    /// <summary>
-    /// Ключевое слово, с которого должен начинаться файл
-    /// </summary>
-    private readonly string _collectionKey = "CollectionsStorage";
-
-    /// <summary>
-    /// Разделитель для записи ключа и значения элемента словаря
-    /// </summary>
-    private readonly string _separatorForKeyValue = "|";
-
-    /// <summary>
-    /// Разделитель для записей коллекции данных в файл
-    /// </summary>
-    private readonly string _separatorItems = ";";
-
     /// <summary>
     /// Конструктор
     /// </summary>
@@ -42,138 +26,6 @@ public class StorageCollection<T> where T : DrawingShip
         _storages = new Dictionary<string, ICollectionGenericObjects<T>>();
     }
 
-
-    /// <summary>
-    /// Сохранение информации по кораблям в хранилище в файл
-    /// </summary>
-    /// <param name="filename">Путь и имя файла</param>
-    /// <returns>true - сохранение прошло успешно, false - ошибка при сохранении данных</returns>
-    public bool SaveData(string filename)
-    {
-        if (_storages.Count == 0)
-        {
-            return false;
-        }
-        if (File.Exists(filename))
-        {
-            File.Delete(filename);
-        }
-        StringBuilder sb = new();
-        sb.Append(_collectionKey);
-        foreach (KeyValuePair<string, ICollectionGenericObjects<T>> value in
-        _storages)
-        {
-            sb.Append(Environment.NewLine);
-            // не сохраняем пустые коллекции
-            if (value.Value.Count == 0)
-            {
-                continue;
-            }
-            sb.Append(value.Key);
-            sb.Append(_separatorForKeyValue);
-            sb.Append(value.Value.GetCollectionType);
-            sb.Append(_separatorForKeyValue);
-            sb.Append(value.Value.MaxCount);
-            sb.Append(_separatorForKeyValue);
-            foreach (T? item in value.Value.GetItems())
-            {
-                string data = item?.GetDataForSave() ?? string.Empty;
-                if (string.IsNullOrEmpty(data))
-                {
-                    continue;
-                }
-                sb.Append(data);
-                sb.Append(_separatorItems);
-            }
-        }
-        using FileStream fs = new(filename, FileMode.Create);
-        byte[] info = new UTF8Encoding(true).GetBytes(sb.ToString());
-        fs.Write(info, 0, info.Length);
-        return true;
-    }
-
-    /// <summary>
-    /// Загрузка информации по кораблям в хранилище из файла
-    /// </summary>
-    /// <param name="filename">Путь и имя файла</param>
-    /// <returns>true - загрузка прошла успешно, false - ошибка при загрузке данных</returns>
-    public bool LoadData(string filename)
-    {
-        if (!File.Exists(filename))
-        {
-            return false;
-        }
-        string bufferTextFromFile = "";
-        using (FileStream fs = new(filename, FileMode.Open))
-        {
-            byte[] b = new byte[fs.Length];
-            UTF8Encoding temp = new(true);
-            while (fs.Read(b, 0, b.Length) > 0)
-            {
-                bufferTextFromFile += temp.GetString(b);
-            }
-        }
-        string[] strs = bufferTextFromFile.Split(new char[] { '\n', '\r' },
-        StringSplitOptions.RemoveEmptyEntries);
-        if (strs == null || strs.Length == 0)
-        {
-            return false;
-        }
-        if (!strs[0].Equals(_collectionKey))
-        {
-            //если нет такой записи, то это не те данные
-            return false;
-        }
-        _storages.Clear();
-        foreach (string data in strs)
-        {
-            string[] record = data.Split(_separatorForKeyValue,
-            StringSplitOptions.RemoveEmptyEntries);
-            if (record.Length != 4)
-            {
-                continue;
-            }
-            CollectionType collectionType =
-            (CollectionType)Enum.Parse(typeof(CollectionType), record[1]);
-            ICollectionGenericObjects<T>? collection =
-            StorageCollection<T>.CreateCollection(collectionType);
-            if (collection == null)
-            {
-                return false;
-            }
-            collection.MaxCount = Convert.ToInt32(record[2]);
-            string[] set = record[3].Split(_separatorItems,
-            StringSplitOptions.RemoveEmptyEntries);
-            foreach (string elem in set)
-            {
-                if (elem?.CreateDrawingShip() is T ship)
-                {
-                    if (collection.Insert(ship) == -1)
-                    {
-                        return false;
-                    }
-                }
-            }
-            _storages.Add(record[0], collection);
-        }
-        return true;
-    }
-
-    /// <summary>
-    /// Создание коллекции по типу
-    /// </summary>
-    /// <param name="collectionType"></param>
-    /// <returns></returns>
-    private static ICollectionGenericObjects<T>? CreateCollection(CollectionType collectionType)
-    {
-        return collectionType switch
-        {
-            CollectionType.Massive => new MassiveGenericObjects<T>(),
-            CollectionType.List => new ListGenericObjects<T>(),
-            _ => null,
-        };
-    }
-
     /// <summary>
     /// Добавление коллекции в хранилище
     /// </summary>

Cruiser/Cruiser/Drawings/DrawingCruiser.cs

@@ -4,12 +4,6 @@ namespace Cruiser.Drawings;
 
 public class DrawingCruiser : DrawingShip
 {
-    public DrawingCruiser(EntityCruiser cruiser) : base(132, 65)
-    {
-        if (cruiser == null) return;
-        EntityShip = new EntityCruiser(cruiser.Speed, cruiser.Weight, cruiser.BodyColor, cruiser.AdditionalColor, cruiser.BodyKit, cruiser.Arms, cruiser.Helicopter);
-    }
-
     /// <summary>
     /// Конструктор
     /// </summary>

Cruiser/Cruiser/Drawings/DrawingShip.cs

@@ -80,12 +80,6 @@ public class DrawingShip
         _drawingShipWidth = drawingShipWidth;
     }
 
-    public DrawingShip(EntityShip ship) : this()
-    {
-        if (ship == null) return;
-        EntityShip = new EntityShip(ship.Speed, ship.Weight, ship.BodyColor);
-    }
-
     /// <summary>
     /// Установка размеров окна
     /// </summary>

Cruiser/Cruiser/Drawings/ExtensionDrawingShip.cs

@@ -1,41 +0,0 @@
-using Cruiser.Entities;
-namespace Cruiser.Drawings;
-public static class ExtentionDrawingShip
-{
-    /// <summary>
-    /// Разделитель для записи информации по объекту в файл
-    /// </summary>
-    private static readonly string _separatorForObject = ":";
-
-    public static DrawingShip? CreateDrawingShip(this string info)
-    {
-        string[] strs = info.Split(_separatorForObject);
-        EntityShip? ship = EntityCruiser.CreateEntityCruiser(strs);
-        if (ship != null)
-        {
-            return new DrawingCruiser((EntityCruiser)ship);
-        }
-        ship = EntityShip.CreateEntityShip(strs);
-        if (ship != null)
-        {
-            return new DrawingShip(ship);
-        }
-        return null;
-    }
-
-    /// <summary>
-    /// Получение данных для сохранения в файл
-    /// </summary>
-    /// <param name="drawningCar"></param>
-    /// <returns></returns>
-    public static string GetDataForSave(this DrawingShip DrawingShip)
-    {
-        string[]? array = DrawingShip?.EntityShip?.GetStringRepresentation();
-        if (array == null)
-        {
-            return string.Empty;
-        }
-        return string.Join(_separatorForObject, array);
-    }
-
-}

Cruiser/Cruiser/Entities/EntityCruiser.cs

@@ -1,6 +1,4 @@
-using System.Threading.Tasks;
-
-namespace Cruiser.Entities;
+namespace Cruiser.Entities;
 
 /// <summary>
 /// Класс-сущность Корабль Круизер
@@ -11,10 +9,7 @@ public class EntityCruiser : EntityShip
     /// Дополнительный цвеь (детали)
     /// </summary>
     public Color AdditionalColor {  get; private set; } 
-    public void SetAdditionalColor(Color additionalColor)
-    {
-        AdditionalColor = additionalColor;
-    }
+
     /// <summary>
     /// Наличие "надстроек"
     /// </summary>
@@ -47,29 +42,4 @@ public class EntityCruiser : EntityShip
         Arms = arms;
         Helicopter = helicopter;
     }
-
-
-    /// <summary>
-    /// Получение строк со значениями свойств продвинутого объекта класса-сущности
-    /// </summary>
-    /// <returns></returns>
-    public override string[] GetStringRepresentation()
-    {
-        return new[] { nameof(EntityCruiser), Speed.ToString(), Weight.ToString(), BodyColor.Name, AdditionalColor.Name,
-                        BodyKit.ToString(), Arms.ToString(), Helicopter.ToString()};
-    }
-    /// <summary>
-    /// Создание продвинутого объекта из массива строк
-    /// </summary>
-    /// <param name="strs"></param>
-    /// <returns></returns>
-    public static EntityCruiser? CreateEntityCruiser(string[] strs)
-    {
-        if (strs.Length != 8 || strs[0] != nameof(EntityCruiser))
-        {
-            return null;
-        }
-        return new EntityCruiser(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]),
-                                    Color.FromName(strs[4]), Convert.ToBoolean(strs[5]), Convert.ToBoolean(strs[6]), Convert.ToBoolean(strs[7]));
-    }
 }

Cruiser/Cruiser/Entities/EntityShip.cs

@@ -25,10 +25,6 @@ public class EntityShip
     /// Основной цвет (контур)
     /// </summary>
     public Color BodyColor { get; private set; }
-    public void SetBodyColor(Color bodyColor)
-    {
-        BodyColor = bodyColor;
-    }
 
     /// <summary>
     /// Шаг перемещения
@@ -47,30 +43,4 @@ public class EntityShip
         Weight = weight;
         BodyColor = bodyСolor;
     }
-
-    //TODO Прописать метод
-
-    /// <summary>
-    /// Получение строк со значениями свойств объекта класса-сущности
-    /// </summary>
-    /// <returns></returns>
-    public virtual string[] GetStringRepresentation()
-    {
-        return new[] { nameof(EntityShip), Speed.ToString(), Weight.ToString(), BodyColor.Name };
-    }
-
-    /// <summary>
-    /// Создание объекта из массива строк
-    /// </summary>
-    /// <param name="strs"></param>
-    /// <returns></returns>
-    public static EntityShip? CreateEntityShip(string[] strs)
-    {
-        if (strs.Length != 4 || strs[0] != nameof(EntityShip))
-        {
-            return null;
-        }
-
-        return new EntityShip(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]));
-    }
 }

Cruiser/Cruiser/FormShipCollection.Designer.cs

@@ -29,13 +29,14 @@
         private void InitializeComponent()
         {
             groupBoxTools = new GroupBox();
-            buttonCreateCompany = new Button();
-            comboBoxSelectorCompany = new ComboBox();
             panelCompanyTools = new Panel();
+            buttonCreateCompany = new Button();
             buttonRefresh = new Button();
+            comboBoxSelectorCompany = new ComboBox();
             buttonGoToCheck = new Button();
             buttonAddShip = new Button();
             buttonRemoveShip = new Button();
+            buttonAddCruiser = new Button();
             maskedTextBox = new MaskedTextBox();
             panelStorage = new Panel();
             buttonCollectionDel = new Button();
@@ -46,33 +47,40 @@
             textBoxCollectionName = new TextBox();
             labelCollectionName = new Label();
             pictureBoxCollection = new PictureBox();
-            menuStrip = new MenuStrip();
-            файлToolStripMenuItem = new ToolStripMenuItem();
-            SaveToolStripMenuItem = new ToolStripMenuItem();
-            LoadToolStripMenuItem = new ToolStripMenuItem();
-            saveFileDialog = new SaveFileDialog();
-            openFileDialog = new OpenFileDialog();
             groupBoxTools.SuspendLayout();
             panelCompanyTools.SuspendLayout();
             panelStorage.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBoxCollection).BeginInit();
-            menuStrip.SuspendLayout();
             SuspendLayout();
             // 
             // groupBoxTools
             // 
             groupBoxTools.Controls.Add(buttonCreateCompany);
-            groupBoxTools.Controls.Add(comboBoxSelectorCompany);
             groupBoxTools.Controls.Add(panelCompanyTools);
             groupBoxTools.Controls.Add(panelStorage);
             groupBoxTools.Dock = DockStyle.Right;
-            groupBoxTools.Location = new Point(852, 28);
+            groupBoxTools.Location = new Point(852, 0);
             groupBoxTools.Name = "groupBoxTools";
-            groupBoxTools.Size = new Size(324, 742);
+            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);
@@ -83,35 +91,10 @@
             buttonCreateCompany.UseVisualStyleBackColor = true;
             buttonCreateCompany.Click += ButtonCreateCompany_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(31, 381);
-            comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
-            comboBoxSelectorCompany.Size = new Size(240, 28);
-            comboBoxSelectorCompany.TabIndex = 0;
-            comboBoxSelectorCompany.SelectedIndexChanged += comboBoxSelectorCompany_SelectedIndexChanged;
-            // 
-            // panelCompanyTools
-            // 
-            panelCompanyTools.Controls.Add(buttonRefresh);
-            panelCompanyTools.Controls.Add(buttonGoToCheck);
-            panelCompanyTools.Controls.Add(buttonAddShip);
-            panelCompanyTools.Controls.Add(buttonRemoveShip);
-            panelCompanyTools.Controls.Add(maskedTextBox);
-            panelCompanyTools.Enabled = false;
-            panelCompanyTools.Location = new Point(12, 446);
-            panelCompanyTools.Name = "panelCompanyTools";
-            panelCompanyTools.Size = new Size(300, 300);
-            panelCompanyTools.TabIndex = 2;
-            // 
             // buttonRefresh
             // 
             buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRefresh.Location = new Point(19, 219);
+            buttonRefresh.Location = new Point(19, 313);
             buttonRefresh.Name = "buttonRefresh";
             buttonRefresh.Size = new Size(240, 52);
             buttonRefresh.TabIndex = 6;
@@ -119,10 +102,22 @@
             buttonRefresh.UseVisualStyleBackColor = true;
             buttonRefresh.Click += ButtonRefresh_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(19, 14);
+            comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
+            comboBoxSelectorCompany.Size = new Size(240, 28);
+            comboBoxSelectorCompany.TabIndex = 0;
+            comboBoxSelectorCompany.SelectedIndexChanged += comboBoxSelectorCompany_SelectedIndexChanged;
+            // 
             // buttonGoToCheck
             // 
             buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonGoToCheck.Location = new Point(19, 161);
+            buttonGoToCheck.Location = new Point(19, 255);
             buttonGoToCheck.Name = "buttonGoToCheck";
             buttonGoToCheck.Size = new Size(240, 52);
             buttonGoToCheck.TabIndex = 5;
@@ -133,7 +128,7 @@
             // buttonAddShip
             // 
             buttonAddShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonAddShip.Location = new Point(19, 12);
+            buttonAddShip.Location = new Point(19, 48);
             buttonAddShip.Name = "buttonAddShip";
             buttonAddShip.Size = new Size(240, 52);
             buttonAddShip.TabIndex = 1;
@@ -144,7 +139,7 @@
             // buttonRemoveShip
             // 
             buttonRemoveShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRemoveShip.Location = new Point(19, 103);
+            buttonRemoveShip.Location = new Point(19, 197);
             buttonRemoveShip.Name = "buttonRemoveShip";
             buttonRemoveShip.Size = new Size(240, 52);
             buttonRemoveShip.TabIndex = 4;
@@ -152,10 +147,21 @@
             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, 70);
+            maskedTextBox.Location = new Point(19, 164);
             maskedTextBox.Mask = "00";
             maskedTextBox.Name = "maskedTextBox";
             maskedTextBox.Size = new Size(240, 27);
@@ -246,54 +252,12 @@
             // pictureBoxCollection
             // 
             pictureBoxCollection.Dock = DockStyle.Fill;
-            pictureBoxCollection.Location = new Point(0, 28);
+            pictureBoxCollection.Location = new Point(0, 0);
             pictureBoxCollection.Name = "pictureBoxCollection";
-            pictureBoxCollection.Size = new Size(852, 742);
+            pictureBoxCollection.Size = new Size(852, 770);
             pictureBoxCollection.TabIndex = 1;
             pictureBoxCollection.TabStop = false;
             // 
-            // menuStrip
-            // 
-            menuStrip.ImageScalingSize = new Size(20, 20);
-            menuStrip.Items.AddRange(new ToolStripItem[] { файлToolStripMenuItem });
-            menuStrip.Location = new Point(0, 0);
-            menuStrip.Name = "menuStrip";
-            menuStrip.Size = new Size(1176, 28);
-            menuStrip.TabIndex = 2;
-            menuStrip.Text = "menuStrip";
-            // 
-            // файлToolStripMenuItem
-            // 
-            файлToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { SaveToolStripMenuItem, LoadToolStripMenuItem });
-            файлToolStripMenuItem.Name = "файлToolStripMenuItem";
-            файлToolStripMenuItem.Size = new Size(59, 24);
-            файлToolStripMenuItem.Text = "Файл";
-            // 
-            // SaveToolStripMenuItem
-            // 
-            SaveToolStripMenuItem.Name = "SaveToolStripMenuItem";
-            SaveToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.S;
-            SaveToolStripMenuItem.Size = new Size(227, 26);
-            SaveToolStripMenuItem.Text = "Сохранение";
-            SaveToolStripMenuItem.Click += SaveToolStripMenuItem_Click;
-            // 
-            // LoadToolStripMenuItem
-            // 
-            LoadToolStripMenuItem.Name = "LoadToolStripMenuItem";
-            LoadToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.L;
-            LoadToolStripMenuItem.Size = new Size(227, 26);
-            LoadToolStripMenuItem.Text = "Загрузка";
-            LoadToolStripMenuItem.Click += LoadToolStripMenuItem_Click;
-            // 
-            // saveFileDialog
-            // 
-            saveFileDialog.Filter = "txt file | *.txt";
-      
-            // 
-            // openFileDialog
-            // 
-            openFileDialog.Filter = "txt file | *.txt";
-            // 
             // FormShipCollection
             // 
             AutoScaleDimensions = new SizeF(8F, 20F);
@@ -301,8 +265,6 @@
             ClientSize = new Size(1176, 770);
             Controls.Add(pictureBoxCollection);
             Controls.Add(groupBoxTools);
-            Controls.Add(menuStrip);
-            MainMenuStrip = menuStrip;
             Name = "FormShipCollection";
             Text = "Коллекция кораблей";
             groupBoxTools.ResumeLayout(false);
@@ -311,15 +273,13 @@
             panelStorage.ResumeLayout(false);
             panelStorage.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBoxCollection).EndInit();
-            menuStrip.ResumeLayout(false);
-            menuStrip.PerformLayout();
             ResumeLayout(false);
-            PerformLayout();
         }
 
         #endregion
 
         private GroupBox groupBoxTools;
+        private Button buttonAddCruiser;
         private Button buttonAddShip;
         private MaskedTextBox maskedTextBox;
         private PictureBox pictureBoxCollection;
@@ -337,11 +297,5 @@
         private Button buttonCollectionDel;
         private Button buttonCreateCompany;
         private Panel panelCompanyTools;
-        private MenuStrip menuStrip;
-        private ToolStripMenuItem файлToolStripMenuItem;
-        private ToolStripMenuItem SaveToolStripMenuItem;
-        private ToolStripMenuItem LoadToolStripMenuItem;
-        private SaveFileDialog saveFileDialog;
-        private OpenFileDialog openFileDialog;
     }
 }

Cruiser/Cruiser/FormShipCollection.cs

@@ -1,5 +1,16 @@
 using Cruiser.CollectionGenericObjects;
 using Cruiser.Drawings;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Diagnostics.Metrics;
+using System.Drawing;
+using System.Linq;
+using System.Runtime.InteropServices.Marshalling;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
 
 namespace Cruiser;
 
@@ -13,14 +24,27 @@ public partial class FormShipCollection : Form
         InitializeComponent();
     }
 
-    private void SetShip(DrawingShip? ship)
+    private void CreateObject(string type)
     {
-        if (_company == null || ship == null)
+        if (_company == null) { return; }
+        DrawingShip drawingShip;
+        Random random = new();
+        switch (type)
         {
-            return;
+            case nameof(DrawingShip):
+                drawingShip = new DrawingShip(random.Next(100, 300), random.Next(1000, 3000), GetColor(random));
+                break;
+            case nameof(DrawingCruiser):
+                Color mainColor = GetColor(random);
+                Color additionalColor = GetColor(random);
+                drawingShip = new DrawingCruiser(random.Next(100, 300), random.Next(1000, 3000),
+                    mainColor, additionalColor,
+                    Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
+                break;
+            default:
+                return;
         }
-
-        if (_company + ship != -1)
+        if (_company + drawingShip >= 0)
         {
             MessageBox.Show("Объект добавлен");
             pictureBoxCollection.Image = _company.Show();
@@ -31,23 +55,31 @@ public partial class FormShipCollection : Form
         }
     }
 
+    private static Color GetColor(Random random)
+    {
+        Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
+        ColorDialog dialog = new();
+        if (dialog.ShowDialog() == DialogResult.OK)
+        {
+            color = dialog.Color;
+        }
+        return color;
+    }
 
     private void comboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
     {
-        panelCompanyTools.Enabled = false;
-    }
-
-    private void ButtonAddShip_Click(object sender, EventArgs e)
-    {
-        if (_company == null)
+        switch (comboBoxSelectorCompany.Text)
         {
-            return;
+            case "Хранилище":
+                _company = new Docs(pictureBoxCollection.Width, pictureBoxCollection.Height, new MassiveGenericObjects<DrawingShip>());
+                break;
         }
-        FormShipConfig form = new();
-        form._shipDelegate += SetShip;
-        form.Show();
     }
 
+    private void ButtonAddShip_Click(object sender, EventArgs e) => CreateObject(nameof(DrawingShip));
+
+
+    private void ButtonAddCruiser_Click(object sender, EventArgs e) => CreateObject(nameof(DrawingCruiser));
 
     private void ButtonRemoveShip_Click(object sender, EventArgs e)
     {
@@ -136,6 +168,10 @@ public partial class FormShipCollection : Form
 
     private void ButtonCollectionDel_Click(object sender, EventArgs e)
     {
+        // TODO прописать логику удаления элемента из коллекции
+        // нужно убедиться, что есть выбранная коллекция
+        // спросить у пользователя через MessageBox, что он подтверждает, что хочет удалить запись
+        // удалить и обновить ListBox
         if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
         {
             MessageBox.Show("Коллекция не выбрана");
@@ -188,38 +224,4 @@ public partial class FormShipCollection : Form
         panelCompanyTools.Enabled = true;
         RefreshListBoxItems();
     }
-
-    private void SaveToolStripMenuItem_Click(object sender, EventArgs e)
-    {
-        if (saveFileDialog.ShowDialog() == DialogResult.OK)
-        {
-            if (_storageCollection.SaveData(saveFileDialog.FileName))
-            {
-                MessageBox.Show("Сохранение прошло успешно",
-                "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
-            }
-            else
-            {
-                MessageBox.Show("Не сохранилось", "Результат",
-                MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-    }
-
-    private void LoadToolStripMenuItem_Click(object sender, EventArgs e)
-    {
-        if (openFileDialog.ShowDialog() == DialogResult.OK)
-        {
-            if (_storageCollection.LoadData(openFileDialog.FileName))
-            {
-                MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                RefreshListBoxItems();
-            }
-            else
-            {
-                MessageBox.Show("Не удалось сохранить", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-    }
-
 }

Cruiser/Cruiser/FormShipCollection.resx

@@ -117,13 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>145, 17</value>
-  </metadata>
-  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>310, 17</value>
-  </metadata>
 </root>

Cruiser/Cruiser/FormShipConfig.Designer.cs

@@ -1,366 +0,0 @@
-namespace Cruiser
-{
-    partial class FormShipConfig
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            groupBoxConfig = new GroupBox();
-            groupBoxColors = new GroupBox();
-            panelWhite = new Panel();
-            panelPurple = new Panel();
-            panelGreen = new Panel();
-            panelBlue = new Panel();
-            panelSkyBlue = new Panel();
-            panelYellow = new Panel();
-            panelOrange = new Panel();
-            panelRed = new Panel();
-            checkBoxArms = new CheckBox();
-            checkBoxHelicopter = new CheckBox();
-            checkBoxBodyKit = new CheckBox();
-            numericUpDownWeight = new NumericUpDown();
-            numericUpDownSpeed = new NumericUpDown();
-            labelWeight = new Label();
-            labelSpeed = new Label();
-            labelModifiedObject = new Label();
-            labelSimpleObject = new Label();
-            pictureBoxObject = new PictureBox();
-            buttonAdd = new Button();
-            buttonCancel = new Button();
-            panelObject = new Panel();
-            labelAdditionalColor = new Label();
-            labelBodyColor = new Label();
-            groupBoxConfig.SuspendLayout();
-            groupBoxColors.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit();
-            panelObject.SuspendLayout();
-            SuspendLayout();
-            // 
-            // groupBoxConfig
-            // 
-            groupBoxConfig.Controls.Add(groupBoxColors);
-            groupBoxConfig.Controls.Add(checkBoxArms);
-            groupBoxConfig.Controls.Add(checkBoxHelicopter);
-            groupBoxConfig.Controls.Add(checkBoxBodyKit);
-            groupBoxConfig.Controls.Add(numericUpDownWeight);
-            groupBoxConfig.Controls.Add(numericUpDownSpeed);
-            groupBoxConfig.Controls.Add(labelWeight);
-            groupBoxConfig.Controls.Add(labelSpeed);
-            groupBoxConfig.Controls.Add(labelModifiedObject);
-            groupBoxConfig.Controls.Add(labelSimpleObject);
-            groupBoxConfig.Dock = DockStyle.Left;
-            groupBoxConfig.Location = new Point(0, 0);
-            groupBoxConfig.Name = "groupBoxConfig";
-            groupBoxConfig.Size = new Size(673, 217);
-            groupBoxConfig.TabIndex = 0;
-            groupBoxConfig.TabStop = false;
-            groupBoxConfig.Text = "Параметры";
-            // 
-            // groupBoxColors
-            // 
-            groupBoxColors.Controls.Add(panelWhite);
-            groupBoxColors.Controls.Add(panelPurple);
-            groupBoxColors.Controls.Add(panelGreen);
-            groupBoxColors.Controls.Add(panelBlue);
-            groupBoxColors.Controls.Add(panelSkyBlue);
-            groupBoxColors.Controls.Add(panelYellow);
-            groupBoxColors.Controls.Add(panelOrange);
-            groupBoxColors.Controls.Add(panelRed);
-            groupBoxColors.Location = new Point(239, 26);
-            groupBoxColors.Name = "groupBoxColors";
-            groupBoxColors.Size = new Size(266, 125);
-            groupBoxColors.TabIndex = 9;
-            groupBoxColors.TabStop = false;
-            groupBoxColors.Text = "Цвета";
-            // 
-            // panelWhite
-            // 
-            panelWhite.BackColor = Color.White;
-            panelWhite.Location = new Point(200, 79);
-            panelWhite.Name = "panelWhite";
-            panelWhite.Size = new Size(39, 36);
-            panelWhite.TabIndex = 4;
-            // 
-            // panelPurple
-            // 
-            panelPurple.BackColor = Color.DarkViolet;
-            panelPurple.Location = new Point(133, 79);
-            panelPurple.Name = "panelPurple";
-            panelPurple.Size = new Size(39, 36);
-            panelPurple.TabIndex = 1;
-            // 
-            // panelGreen
-            // 
-            panelGreen.BackColor = Color.Green;
-            panelGreen.Location = new Point(73, 79);
-            panelGreen.Name = "panelGreen";
-            panelGreen.Size = new Size(39, 36);
-            panelGreen.TabIndex = 3;
-            // 
-            // panelBlue
-            // 
-            panelBlue.BackColor = Color.Blue;
-            panelBlue.Location = new Point(6, 79);
-            panelBlue.Name = "panelBlue";
-            panelBlue.Size = new Size(39, 36);
-            panelBlue.TabIndex = 2;
-            // 
-            // panelSkyBlue
-            // 
-            panelSkyBlue.BackColor = Color.LightSkyBlue;
-            panelSkyBlue.Location = new Point(200, 26);
-            panelSkyBlue.Name = "panelSkyBlue";
-            panelSkyBlue.Size = new Size(39, 36);
-            panelSkyBlue.TabIndex = 1;
-            // 
-            // panelYellow
-            // 
-            panelYellow.BackColor = Color.Yellow;
-            panelYellow.Location = new Point(133, 26);
-            panelYellow.Name = "panelYellow";
-            panelYellow.Size = new Size(39, 36);
-            panelYellow.TabIndex = 1;
-            // 
-            // panelOrange
-            // 
-            panelOrange.BackColor = Color.Orange;
-            panelOrange.Location = new Point(73, 26);
-            panelOrange.Name = "panelOrange";
-            panelOrange.Size = new Size(39, 36);
-            panelOrange.TabIndex = 1;
-            // 
-            // panelRed
-            // 
-            panelRed.BackColor = Color.Red;
-            panelRed.Location = new Point(6, 26);
-            panelRed.Name = "panelRed";
-            panelRed.Size = new Size(39, 36);
-            panelRed.TabIndex = 0;
-            // 
-            // checkBoxArms
-            // 
-            checkBoxArms.AutoSize = true;
-            checkBoxArms.Location = new Point(20, 177);
-            checkBoxArms.Name = "checkBoxArms";
-            checkBoxArms.Size = new Size(138, 24);
-            checkBoxArms.TabIndex = 8;
-            checkBoxArms.Text = "Ракетная шахта";
-            checkBoxArms.UseVisualStyleBackColor = true;
-            // 
-            // checkBoxHelicopter
-            // 
-            checkBoxHelicopter.AutoSize = true;
-            checkBoxHelicopter.Location = new Point(20, 147);
-            checkBoxHelicopter.Name = "checkBoxHelicopter";
-            checkBoxHelicopter.Size = new Size(192, 24);
-            checkBoxHelicopter.TabIndex = 7;
-            checkBoxHelicopter.Text = "Вертолетная площадка";
-            checkBoxHelicopter.UseVisualStyleBackColor = true;
-            // 
-            // checkBoxBodyKit
-            // 
-            checkBoxBodyKit.AutoSize = true;
-            checkBoxBodyKit.Location = new Point(20, 117);
-            checkBoxBodyKit.Name = "checkBoxBodyKit";
-            checkBoxBodyKit.Size = new Size(85, 24);
-            checkBoxBodyKit.TabIndex = 6;
-            checkBoxBodyKit.Text = "Обвесы";
-            checkBoxBodyKit.UseVisualStyleBackColor = true;
-            // 
-            // numericUpDownWeight
-            // 
-            numericUpDownWeight.Location = new Point(102, 71);
-            numericUpDownWeight.Name = "numericUpDownWeight";
-            numericUpDownWeight.Size = new Size(110, 27);
-            numericUpDownWeight.TabIndex = 5;
-            numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 });
-            // 
-            // numericUpDownSpeed
-            // 
-            numericUpDownSpeed.Location = new Point(102, 35);
-            numericUpDownSpeed.Name = "numericUpDownSpeed";
-            numericUpDownSpeed.Size = new Size(110, 27);
-            numericUpDownSpeed.TabIndex = 4;
-            numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 });
-            // 
-            // labelWeight
-            // 
-            labelWeight.AutoSize = true;
-            labelWeight.Location = new Point(20, 78);
-            labelWeight.Name = "labelWeight";
-            labelWeight.Size = new Size(36, 20);
-            labelWeight.TabIndex = 3;
-            labelWeight.Text = "Вес:";
-            // 
-            // labelSpeed
-            // 
-            labelSpeed.AutoSize = true;
-            labelSpeed.Location = new Point(20, 42);
-            labelSpeed.Name = "labelSpeed";
-            labelSpeed.Size = new Size(76, 20);
-            labelSpeed.TabIndex = 2;
-            labelSpeed.Text = "Скорость:";
-            // 
-            // labelModifiedObject
-            // 
-            labelModifiedObject.BorderStyle = BorderStyle.FixedSingle;
-            labelModifiedObject.Location = new Point(439, 160);
-            labelModifiedObject.Name = "labelModifiedObject";
-            labelModifiedObject.Size = new Size(172, 41);
-            labelModifiedObject.TabIndex = 1;
-            labelModifiedObject.Text = "Продвинутый";
-            labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter;
-            labelModifiedObject.MouseDown += labelObject_MouseDown;
-            // 
-            // labelSimpleObject
-            // 
-            labelSimpleObject.BorderStyle = BorderStyle.FixedSingle;
-            labelSimpleObject.Location = new Point(239, 160);
-            labelSimpleObject.Name = "labelSimpleObject";
-            labelSimpleObject.Size = new Size(172, 41);
-            labelSimpleObject.TabIndex = 0;
-            labelSimpleObject.Text = "Простой";
-            labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter;
-            labelSimpleObject.MouseDown += labelObject_MouseDown;
-            // 
-            // pictureBoxObject
-            // 
-            pictureBoxObject.Location = new Point(29, 71);
-            pictureBoxObject.Name = "pictureBoxObject";
-            pictureBoxObject.Size = new Size(192, 93);
-            pictureBoxObject.TabIndex = 1;
-            pictureBoxObject.TabStop = false;
-            // 
-            // buttonAdd
-            // 
-            buttonAdd.Location = new Point(679, 188);
-            buttonAdd.Name = "buttonAdd";
-            buttonAdd.Size = new Size(94, 29);
-            buttonAdd.TabIndex = 2;
-            buttonAdd.Text = "Добавить";
-            buttonAdd.UseVisualStyleBackColor = true;
-            buttonAdd.Click += buttonAdd_Click;
-            // 
-            // buttonCancel
-            // 
-            buttonCancel.Location = new Point(779, 188);
-            buttonCancel.Name = "buttonCancel";
-            buttonCancel.Size = new Size(94, 29);
-            buttonCancel.TabIndex = 3;
-            buttonCancel.Text = "Отмена";
-            buttonCancel.UseVisualStyleBackColor = true;
-            // 
-            // panelObject
-            // 
-            panelObject.AllowDrop = true;
-            panelObject.Controls.Add(labelAdditionalColor);
-            panelObject.Controls.Add(labelBodyColor);
-            panelObject.Controls.Add(pictureBoxObject);
-            panelObject.Location = new Point(679, 0);
-            panelObject.Name = "panelObject";
-            panelObject.Size = new Size(255, 182);
-            panelObject.TabIndex = 4;
-            panelObject.DragDrop += panelObject_DragDrop;
-            panelObject.DragEnter += panelObject_DragEnter;
-            // 
-            // labelAdditionalColor
-            // 
-            labelAdditionalColor.AllowDrop = true;
-            labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle;
-            labelAdditionalColor.Location = new Point(100, 8);
-            labelAdditionalColor.Name = "labelAdditionalColor";
-            labelAdditionalColor.Size = new Size(94, 41);
-            labelAdditionalColor.TabIndex = 3;
-            labelAdditionalColor.Text = "Доп цвет";
-            labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter;
-            labelAdditionalColor.DragDrop += labelAdditionalColor_DragDrop;
-            labelAdditionalColor.DragEnter += labelAdditionalColor_DragEnter;
-            // 
-            // labelBodyColor
-            // 
-            labelBodyColor.AllowDrop = true;
-            labelBodyColor.BorderStyle = BorderStyle.FixedSingle;
-            labelBodyColor.Location = new Point(3, 9);
-            labelBodyColor.Name = "labelBodyColor";
-            labelBodyColor.Size = new Size(91, 40);
-            labelBodyColor.TabIndex = 2;
-            labelBodyColor.Text = "Цвет";
-            labelBodyColor.TextAlign = ContentAlignment.MiddleCenter;
-            labelBodyColor.DragDrop += labelBodyColor_DragDrop;
-            labelBodyColor.DragEnter += labelBodyColor_DragEnter;
-            // 
-            // FormShipConfig
-            // 
-            AutoScaleDimensions = new SizeF(8F, 20F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(937, 217);
-            Controls.Add(panelObject);
-            Controls.Add(buttonCancel);
-            Controls.Add(buttonAdd);
-            Controls.Add(groupBoxConfig);
-            Name = "FormShipConfig";
-            Text = "Создание объекта";
-            groupBoxConfig.ResumeLayout(false);
-            groupBoxConfig.PerformLayout();
-            groupBoxColors.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit();
-            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit();
-            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit();
-            panelObject.ResumeLayout(false);
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private GroupBox groupBoxConfig;
-        private Label labelSimpleObject;
-        private NumericUpDown numericUpDownWeight;
-        private NumericUpDown numericUpDownSpeed;
-        private Label labelWeight;
-        private Label labelSpeed;
-        private Label labelModifiedObject;
-        private CheckBox checkBoxBodyKit;
-        private CheckBox checkBoxArms;
-        private CheckBox checkBoxHelicopter;
-        private GroupBox groupBoxColors;
-        private Panel panelWhite;
-        private Panel panelPurple;
-        private Panel panelGreen;
-        private Panel panelBlue;
-        private Panel panelSkyBlue;
-        private Panel panelYellow;
-        private Panel panelOrange;
-        private Panel panelRed;
-        private PictureBox pictureBoxObject;
-        private Button buttonAdd;
-        private Button buttonCancel;
-        private Panel panelObject;
-        private Label labelAdditionalColor;
-        private Label labelBodyColor;
-    }
-}

Cruiser/Cruiser/FormShipConfig.cs

@@ -1,136 +0,0 @@
-using Cruiser.Drawings;
-using Cruiser.Entities;
-
-
-namespace Cruiser;
-
-public partial class FormShipConfig : Form
-{
-    private DrawingShip? _ship;
-
-
-    public event Action<DrawingShip>? _shipDelegate;
-    public FormShipConfig()
-    {
-        InitializeComponent();
-        panelRed.MouseDown += panel_MouseDown;
-        panelOrange.MouseDown += panel_MouseDown;
-        panelYellow.MouseDown += panel_MouseDown;
-        panelBlue.MouseDown += panel_MouseDown;
-        panelSkyBlue.MouseDown += panel_MouseDown;
-        panelPurple.MouseDown += panel_MouseDown;
-        panelGreen.MouseDown += panel_MouseDown;
-        panelWhite.MouseDown += panel_MouseDown;
-        buttonCancel.Click += (sender, e) => Close();
-    }
-
-    public void AddEvent(Action<DrawingShip> shipDelegate)
-    {
-        _shipDelegate += shipDelegate;
-    }
-
-    private void DrawObject()
-    {
-        Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
-        Graphics gr = Graphics.FromImage(bmp);
-        _ship?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height);
-        _ship?.SetPosition(15, 15);
-        _ship?.DrawTransport(gr);
-        pictureBoxObject.Image = bmp;
-    }
-
-    private void labelObject_MouseDown(object sender, MouseEventArgs e)
-    {
-        var label = sender as Label;
-        label?.DoDragDrop(label?.Name ?? string.Empty, DragDropEffects.Move | DragDropEffects.Copy);
-    }
-
-    private void panelObject_DragEnter(object sender, DragEventArgs e)
-    {
-        if (e.Data?.GetDataPresent(DataFormats.Text) ?? false)
-        {
-            e.Effect = DragDropEffects.Copy;
-        }
-        else
-        {
-            e.Effect = DragDropEffects.None;
-        }
-    }
-
-    private void panelObject_DragDrop(object sender, DragEventArgs e)
-    {
-        switch (e.Data?.GetData(DataFormats.Text)?.ToString())
-        {
-            case "labelSimpleObject":
-                _ship = new DrawingShip((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White);
-                break;
-            case "labelModifiedObject":
-                _ship = new DrawingCruiser((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White,
-                    Color.Black, checkBoxBodyKit.Checked, checkBoxArms.Checked, checkBoxHelicopter.Checked);
-                break;
-        }
-
-        DrawObject();
-    }
-
-    private void panel_MouseDown(object? sender, MouseEventArgs e)
-    {
-        var panel = sender as Panel;
-        panel?.DoDragDrop(panel?.BackColor ?? Color.White, DragDropEffects.Move | DragDropEffects.Copy);
-    }
-
-
-    private void buttonAdd_Click(object sender, EventArgs e)
-    {
-        if (_ship != null)
-        {
-            _shipDelegate?.Invoke(_ship);
-            Close();
-        }
-    }
-
-    private void labelBodyColor_DragDrop(object sender, DragEventArgs e)
-    {
-        if (_ship != null)
-        {
-            _ship.EntityShip?.SetBodyColor((Color)e.Data.GetData(typeof(Color)));
-            DrawObject();
-        }
-    }
-
-    private void labelBodyColor_DragEnter(object sender, DragEventArgs e)
-    {
-        if (e.Data.GetDataPresent(typeof(Color)))
-        {
-            e.Effect = DragDropEffects.Copy;
-        }
-        else
-        {
-            e.Effect = DragDropEffects.None;
-        }
-    }
-
-    private void labelAdditionalColor_DragEnter(object sender, DragEventArgs e)
-    {
-        if (_ship is DrawingCruiser)
-        {
-            if (e.Data.GetDataPresent(typeof(Color)))
-            {
-                e.Effect = DragDropEffects.Copy;
-            }
-            else
-            {
-                e.Effect = DragDropEffects.None;
-            }
-        }
-    }
-
-    private void labelAdditionalColor_DragDrop(object sender, DragEventArgs e)
-    {
-        if (_ship?.EntityShip is EntityCruiser _cruiser)
-        {
-            _cruiser.SetAdditionalColor((Color)e.Data.GetData(typeof(Color)));
-        }
-        DrawObject();
-    }
-}

Cruiser/Cruiser/FormShipConfig.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema 
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

Cruiser/Cruiser/ShipDelegate.cs

@@ -1,6 +0,0 @@
-using Cruiser.Drawings;
-
-namespace Cruiser;
-
-public delegate void ShipDelegate(DrawingShip ship);
-