lab8

.gitignore

@@ -398,3 +398,4 @@ FodyWeavers.xsd
 # JetBrains Rider
 *.sln.iml
 
+/Stormtrooper/Stormtrooper/Drawnings/ExtentionDrawningCar.cs

Stormtrooper/Stormtrooper/CollectionGenericObjects/AbstractCompany.cs

@@ -1,4 +1,5 @@
 using Stormtrooper.Drawnings;
+using Stormtrooper.Exceptions;
 
 namespace Stormtrooper.CollectionGenericObjects;
 
@@ -35,8 +36,7 @@ public abstract class AbstractCompany
     /// <summary>
     /// Вычисление максимального количества элементов, который можно разместить в окне
     /// </summary>
-    private int GetMaxCount => _pictureWidth * _pictureHeight / (_placeSizeWidth * _placeSizeHeight);
-
+    private int GetMaxCount => (_pictureWidth / _placeSizeWidth) * (_pictureHeight / _placeSizeHeight);
     /// <summary>
     /// Конструктор
     /// </summary>
@@ -49,18 +49,19 @@ public abstract class AbstractCompany
         _pictureWidth = picWidth;
         _pictureHeight = picHeight;
         _collection = collection;
-        _collection.SetMaxCount = GetMaxCount;
+        _collection.MaxCount = GetMaxCount;
     }
 
     /// <summary>
     /// Перегрузка оператора сложения для класса
     /// </summary>
     /// <param name="company">Компания</param>
-    /// <param name="сruiser">Добавляемый объект</param>
+    /// <param name="aircraft">Добавляемый объект</param>
     /// <returns></returns>
     public static int operator +(AbstractCompany company, DrawningAircraft aircraft)
     {
-        return company._collection.Insert(aircraft);
+        return company._collection?.Insert(aircraft, new DrawningAircraftEquitables()) ??
+               throw new DrawningEquitablesException();
     }
 
     /// <summary>
@@ -83,7 +84,11 @@ public abstract class AbstractCompany
         Random rnd = new();
         return _collection?.Get(rnd.Next(GetMaxCount));
     }
-
+    /// <summary>
+    /// Сортировка
+    /// </summary>
+    /// <param name="comparer">Сравнитель объектов</param>
+    public void Sort(IComparer<DrawningAircraft?> comparer) => _collection?.CollectionSort(comparer);
     /// <summary>
     /// Вывод всей коллекции
     /// </summary>
@@ -92,20 +97,30 @@ public abstract class AbstractCompany
     {
         Bitmap bitmap = new(_pictureWidth, _pictureHeight);
         Graphics graphics = Graphics.FromImage(bitmap);
-        DrawBackgound(graphics);
+        DrawBackground(graphics);
+
         SetObjectsPosition();
         for (int i = 0; i < (_collection?.Count ?? 0); ++i)
         {
-            DrawningAircraft? obj = _collection?.Get(i);
-            obj?.DrawTransport(graphics);
+            try
+            {
+                DrawningAircraft? obj = _collection?.Get(i);
+                obj?.DrawTransport(graphics);
+            }
+            catch (ObjectNotFoundException e)
+            { }
+            catch (PositionOutOfCollectionException e)
+            { }
         }
+
         return bitmap;
     }
+
     /// <summary>
     /// Вывод заднего фона
     /// </summary>
     /// <param name="g"></param>
-    protected abstract void DrawBackgound(Graphics g);
+    protected abstract void DrawBackground(Graphics g);
 
     /// <summary>
     /// Расстановка объектов

Stormtrooper/Stormtrooper/CollectionGenericObjects/AircraftHangarService.cs

@@ -1,4 +1,5 @@
 using Stormtrooper.Drawnings;
+using Stormtrooper.Exceptions;
 
 namespace Stormtrooper.CollectionGenericObjects
 {
@@ -17,7 +18,7 @@ namespace Stormtrooper.CollectionGenericObjects
         ICollectionGenericObjects<DrawningAircraft> collection) : base(picWidth, picHeight, collection)
         {
         }
-        protected override void DrawBackgound(Graphics g)
+        protected override void DrawBackground(Graphics g)
         {
             int width = _pictureWidth / _placeSizeWidth;
             int height = _pictureHeight / _placeSizeHeight;
@@ -41,18 +42,18 @@ namespace Stormtrooper.CollectionGenericObjects
 
             for (int i = 0; i < (_collection?.Count ?? 0); i++)
             {
-                if (_collection.Get(i) != null)
-                {
+                try {
                     _collection.Get(i).SetPictureSize(_pictureWidth, _pictureHeight);
                     _collection.Get(i).SetPosition(_placeSizeWidth * curWidth + 10, curHeight * _placeSizeHeight + 10);
                 }
-
+                catch (ObjectNotFoundException) { }
+                catch (PositionOutOfCollectionException e) { }
                 if (curWidth > 0)
                     curWidth--;
                 else
                 {
-                    curWidth = width - 1; 
-                    curHeight ++;
+                    curWidth = width - 1;
+                    curHeight++;
                 }
 
                 if (curHeight >= height)
@@ -63,3 +64,4 @@ namespace Stormtrooper.CollectionGenericObjects
         }
     }
 }
+

Stormtrooper/Stormtrooper/CollectionGenericObjects/CollectionInfo.cs

@@ -0,0 +1,84 @@
+using Stormtrooper.CollectionGenericObjects;
+
+namespace Stormtrooper;
+
+public class CollectionInfo : IEquatable<CollectionInfo>
+{
+    /// <summary>
+    /// Название
+    /// </summary>
+    public string Name { get; private set; }
+
+    /// <summary>
+    /// Тип
+    /// </summary>
+    public CollectionType CollectionType { get; private set; }
+
+    /// <summary>
+    /// Описание
+    /// </summary>
+    public string Description { get; private set; }
+
+    /// <summary>
+    /// Разделитель для записи информации по объекту в файл
+    /// </summary>
+    private static readonly string _separator = "-";
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="name">Название</param>
+    /// <param name="collectionType">Тип</param>
+    /// <param name="description">Описание</param>
+    public CollectionInfo(string name, CollectionType collectionType, string
+        description)
+    {
+        Name = name;
+        CollectionType = collectionType;
+        Description = description;
+    }
+
+    /// <summary>
+    /// Создание объекта из строки
+    /// </summary>
+    /// <param name="data">Строка</param>
+    /// <returns>Объект или null</returns>
+    public static CollectionInfo? GetCollectionInfo(string data)
+    {
+        string[] strs = data.Split(_separator,
+            StringSplitOptions.RemoveEmptyEntries);
+        if (strs.Length < 1 || strs.Length > 3)
+        {
+            return null;
+        }
+
+        return new CollectionInfo(strs[0],
+            (CollectionType)Enum.Parse(typeof(CollectionType), strs[1]), strs.Length > 2 ? strs[2] : string.Empty);
+    }
+
+    public override string ToString()
+    {
+        return Name + _separator + CollectionType + _separator + Description;
+    }
+
+    public bool Equals(CollectionInfo? other)
+    {
+        return Name == other?.Name;
+    }
+
+    public override bool Equals(object? obj)
+    {
+        return Equals(obj as CollectionInfo);
+    }
+
+    public bool IsEmpty()
+    {
+        if (string.IsNullOrEmpty(Name) && CollectionType != CollectionType.None) return true;
+        return false;
+    }
+
+    public override int GetHashCode()
+    {
+        return Name.GetHashCode();
+    }
+}

Stormtrooper/Stormtrooper/CollectionGenericObjects/CollectionType.cs

@@ -0,0 +1,20 @@
+namespace Stormtrooper.CollectionGenericObjects;
+
+/// <summary>
+/// Тип коллекции
+/// </summary>
+public enum CollectionType
+{
+    /// <summary>
+    /// Неопределено
+    /// </summary>
+    None = 0,
+    /// <summary>
+    /// Массив
+    /// </summary>
+    Massive = 1,
+    /// <summary>
+    /// Список
+    /// </summary>
+    List = 2
+}

Stormtrooper/Stormtrooper/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -5,39 +5,62 @@
 /// </summary>
 /// <typeparam name="T">Параметр: ограничение - ссылочный тип</typeparam>
 public interface ICollectionGenericObjects<T>
-where T : class
+    where T : class
 {
     /// <summary>
     /// Количество объектов в коллекции
     /// </summary>
     int Count { get; }
+
     /// <summary>
     /// Установка максимального количества элементов
     /// </summary>
-    int SetMaxCount { set; }
+    int MaxCount { get; set; }
+
     /// <summary>
     /// Добавление объекта в коллекцию
     /// </summary>
     /// <param name="obj">Добавляемый объект</param>
     /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
-    int Insert(T obj);
+    int Insert(T obj, IEqualityComparer<T?>? comparer = null);
+
     /// <summary>
     /// Добавление объекта в коллекцию на конкретную позицию
     /// </summary>
     /// <param name="obj">Добавляемый объект</param>
     /// <param name="position">Позиция</param>
     /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
-    int Insert(T obj, int position);
+    int Insert(T obj, int position, IEqualityComparer<T?>? comparer = null);
+
     /// <summary>
     /// Удаление объекта из коллекции с конкретной позиции
     /// </summary>
     /// <param name="position">Позиция</param>
     /// <returns>true - удаление прошло удачно, false - удаление не удалось</returns>
-    T? Remove(int position);
+    T Remove(int position);
+
     /// <summary>
     /// Получение объекта по позиции
     /// </summary>
     /// <param name="position">Позиция</param>
     /// <returns>Объект</returns>
     T? Get(int position);
-}
+
+    /// <summary>
+    /// Получение типа коллекции
+    /// </summary>
+    CollectionType GetCollectionType { get; }
+
+    /// <summary>
+    /// Получение объектов коллекции по одному
+    /// </summary>
+    /// <returns>Поэлементый вывод элементов коллекции</returns>
+    IEnumerable<T?> GetItems();
+
+    /// <summary>
+    /// Сортировка коллекции
+    /// </summary>
+    /// <param name="comparer">Сравнитель объектов</param>
+    void CollectionSort(IComparer<T?> comparer);
+
+}

Stormtrooper/Stormtrooper/CollectionGenericObjects/ListGenericObjects.cs

@@ -0,0 +1,115 @@
+using Stormtrooper.Exceptions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Stormtrooper.CollectionGenericObjects;
+
+/// <summary>
+/// Параметризованный набор объектов
+/// </summary>
+/// <typeparam name="T">Параметр: ограничение - ссылочный тип</typeparam>
+public class ListGenericObjects<T> : ICollectionGenericObjects<T>
+where T : class
+{
+    /// <summary>
+    /// Список объектов, которые храним
+    /// </summary>
+    private readonly List<T?> _collection;
+    /// <summary>
+    /// Максимально допустимое число объектов в списке
+    /// </summary>
+    private int _maxCount;
+    public int Count => _collection.Count;
+
+    public int MaxCount
+    {
+        set
+        {
+            if (value > 0)
+            {
+                _maxCount = value;
+            }
+        }
+        get
+        {
+
+            return Count;
+        }
+    }
+
+    public CollectionType GetCollectionType => CollectionType.List;
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public ListGenericObjects()
+    {
+        _collection = new();
+    }
+    public T Get(int position)
+    {
+        if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position);
+        return _collection[position];
+    }
+
+    public int Insert(T obj, IEqualityComparer<T?>? comparer = null)
+    {
+        if (Count == _maxCount) throw new CollectionOverflowException(Count);
+        if (comparer != null)
+        {
+            for (int i = 0; i < Count; i++)
+            {
+                if (comparer.Equals(_collection[i], obj))
+                {
+                    throw new CollectionInsertException(obj);
+                }
+            }
+        }
+
+        _collection.Add(obj);
+        return Count;
+    }
+    public int Insert(T obj, int position, IEqualityComparer<T?>? comparer = null)
+    {
+        if (Count == _maxCount) throw new CollectionOverflowException(Count);
+        if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position);
+
+        if (comparer != null)
+        {
+            for (int i = 0; i < Count; i++)
+            {
+                if (comparer.Equals(_collection[i], obj))
+                {
+                    throw new CollectionInsertException(obj);
+                }
+            }
+        }
+
+        _collection.Insert(position, obj);
+        return position;
+    }
+
+    public T Remove(int position)
+    {
+        if (position >= _collection.Count || position < 0) throw new PositionOutOfCollectionException(position);
+        T obj = _collection[position];
+        _collection.RemoveAt(position);
+        return obj;
+    }
+
+public IEnumerable<T?> GetItems()
+    {
+        for (int i = 0; i < Count; ++i)
+        {
+            yield return _collection[i];
+        }
+    }
+    public void CollectionSort(IComparer<T?> comparer)
+    {
+        _collection.Sort(comparer);
+    }
+}
+

Stormtrooper/Stormtrooper/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -1,20 +1,46 @@
-using Stormtrooper.Drawnings;
+using Stormtrooper.Exceptions;
+using Stormtrooper.CollectionGenericObjects;
+using Stormtrooper.Exceptions;
 
 namespace Stormtrooper.CollectionGenericObjects;
-
 /// <summary>
 /// Параметризованный набор объектов
 /// </summary>
 /// <typeparam name="T">Параметр: ограничение - ссылочный тип</typeparam>
 public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
-where T : class
+    where T : class
 {
     /// <summary>
     /// Массив объектов, которые храним
     /// </summary>
     private T?[] _collection;
     public int Count => _collection.Length;
-    public int SetMaxCount { set { if (value > 0) { _collection = new T?[value]; } } }
+    /// <summary>
+    /// Установка максимального кол-ва объектов
+    /// </summary>
+    public int MaxCount
+    {
+        get
+        {
+            return _collection.Length;
+        }
+        set
+        {
+            if (value > 0)
+            {
+                if (_collection.Length > 0)
+                {
+                    Array.Resize(ref _collection, value);
+                }
+                else
+                {
+                    _collection = new T?[value];
+                }
+            }
+        }
+    }
+
+    public CollectionType GetCollectionType => CollectionType.Massive;
 
     /// <summary>
     /// Конструктор
@@ -23,68 +49,121 @@ where T : class
     {
         _collection = Array.Empty<T?>();
     }
+    /// <summary>
+    /// Получение объекта по позиции
+    /// </summary>
+    /// <param name="position">Позиция (индекс)</param>
+    /// <returns></returns>
     public T? Get(int position)
     {
-        //  проверка позиции
-        if (position >= _collection.Length || position < 0)
-        {
-            return null;
-        }
+        if (position < 0 || position >= Count) throw new PositionOutOfCollectionException(position);
+        if (_collection[position] == null) throw new ObjectNotFoundException(position);
         return _collection[position];
     }
-    public int Insert(T obj)
+
+    public int Insert(T obj, IEqualityComparer<T?>? comparer = null)
     {
-        //  вставка в свободное место набора
-        int index = 0;
-        while (index < _collection.Length)
+        if (comparer != null)
         {
-            if (_collection[index] == null)
+            for (int i = 0; i < Count; i++)
             {
-                _collection[index] = obj;
-                return index;
+                if (comparer.Equals(_collection[i], obj))
+                {
+                    throw new CollectionInsertException(obj);
+                }
             }
-            index++;
         }
-        return -1;
+
+
+        // вставка в свободное место набора
+        for (int i = 0; i < Count; i++)
+        {
+            if (_collection[i] == null)
+            {
+                _collection[i] = obj;
+                return i;
+            }
+        }
+
+        throw new CollectionOverflowException(Count);
     }
-    public int Insert(T obj, int position)
+
+    public int Insert(T obj, int position, IEqualityComparer<T?>? comparer = null)
     {
+        // проверка позиции
+        if (position < 0 || position >= Count) throw new PositionOutOfCollectionException(position);
 
-        if (position >= _collection.Length || position < 0)
-        { return -1; }
-
-        if (_collection[position] == null)
+        if (comparer != null)
         {
-            _collection[position] = obj;
-            return position;
-        }
-        int index;
-
-        for (index = position + 1; index < _collection.Length; ++index)
-        {
-            if (_collection[index] == null)
+            for (int i = 0; i < Count; i++)
             {
-                _collection[position] = obj;
-                return position;
+                if (comparer.Equals(_collection[i], obj))
+                {
+                    throw new CollectionInsertException(obj);
+                }
             }
         }
 
-        for (index = position - 1; index >= 0; --index)
+        if (_collection[position] != null)
         {
-            if (_collection[index] == null)
+            bool pushed = false;
+            for (int index = position + 1; index < Count; index++)
             {
-                _collection[position] = obj;
-                return position;
+                if (_collection[index] == null)
+                {
+                    position = index;
+                    pushed = true;
+                    break;
+                }
+            }
+
+            if (!pushed)
+            {
+                for (int index = position - 1; index >= 0; index--)
+                {
+                    if (_collection[index] == null)
+                    {
+                        position = index;
+                        pushed = true;
+                        break;
+                    }
+                }
+            }
+
+            if (!pushed)
+            {
+                throw new CollectionOverflowException(Count);
             }
         }
-        return -1;
+
+        _collection[position] = obj;
+        return position;
     }
-    public T Remove(int position)
+
+
+    public T? Remove(int position)
     {
-        if (position >= _collection.Length || position < 0)
-        { return null; }
-        T DrawningAircraft = _collection[position];
+        //  проверка позиции
+        if (position < 0 || position >= Count) throw new PositionOutOfCollectionException(position);
+
+        if (_collection[position] == null) throw new ObjectNotFoundException(position);
+
+        T? temp = _collection[position];
         _collection[position] = null;
-        return DrawningAircraft;
+        return temp;
+    }
+
+    public IEnumerable<T?> GetItems()
+    {
+        for (int i = 0; i < _collection.Length; ++i)
+        {
+            yield return _collection[i];
+        }
+    }
+    public void CollectionSort(IComparer<T?> comparer)
+    {
+        List<T?> value = new List<T?>(_collection);
+        value.Sort(comparer);
+        value.CopyTo(_collection, 0);
     }
 }

Stormtrooper/Stormtrooper/CollectionGenericObjects/StorageCollection.cs

@@ -0,0 +1,215 @@
+using Stormtrooper.CollectionGenericObjects;
+using Stormtrooper.Drawnings;
+using Stormtrooper.Exceptions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Stormtrooper.CollectionGenericObjects;
+
+/// <summary>
+/// Класс-хранилище коллекций
+/// </summary>
+/// <typeparam name="T"></typeparam>
+public class StorageCollection<T>
+where T : DrawningAircraft
+{
+    /// <summary>
+    /// Словарь (хранилище) с коллекциями
+    /// </summary>
+    private Dictionary<CollectionInfo, ICollectionGenericObjects<T>> _storages;
+    /// <summary>
+    /// Возвращение списка названий коллекций
+    /// </summary>
+    public List<CollectionInfo> 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>
+    public StorageCollection()
+    {
+        _storages = new Dictionary<CollectionInfo, ICollectionGenericObjects<T>>();
+    }
+
+    /// <summary>
+    /// Добавление коллекции в хранилище
+    /// </summary>
+    /// <param name="collectionInfo">тип коллекции</param>
+    public void AddCollection(CollectionInfo collectionInfo)
+    {
+        if (_storages.ContainsKey(collectionInfo)) throw new CollectionAlreadyExistsException(collectionInfo);
+        if (collectionInfo.CollectionType == CollectionType.None)
+            throw new CollectionTypeException("Пустой тип коллекции");
+        if (collectionInfo.CollectionType == CollectionType.Massive)
+            _storages[collectionInfo] = new MassiveGenericObjects<T>();
+        else if (collectionInfo.CollectionType == CollectionType.List)
+            _storages[collectionInfo] = new ListGenericObjects<T>();
+    }
+
+    /// <summary>
+    /// Удаление коллекции
+    /// </summary>
+    /// <param name="collectionInfo">тип коллекции</param>
+    public void DelCollection(CollectionInfo collectionInfo)
+    {
+        if (_storages.ContainsKey(collectionInfo))
+            _storages.Remove(collectionInfo);
+    }
+
+   /// <summary>
+   /// Доступ к коллекции
+   /// </summary>
+   /// <param name="collectionInfo"></param>
+   /// <returns></returns>
+    public ICollectionGenericObjects<T>? this[CollectionInfo collectionInfo]
+    {
+        get
+        {
+            if (_storages.ContainsKey(collectionInfo))
+                return _storages[collectionInfo];
+            return null;
+        }
+    }
+
+   /// <summary>
+   /// Сохранение информации по самолетам в файл
+   /// </summary>
+   /// <param name="filename"></param>
+   /// <exception cref="EmptyFileExeption"></exception>
+    public void SaveData(string filename)
+    {
+        if (_storages.Count == 0)
+        {
+            throw new EmptyFileExeption();
+        }
+
+        if (File.Exists(filename))
+        {
+            File.Delete(filename);
+        }
+
+        using (StreamWriter writer = new StreamWriter(filename))
+        {
+            writer.Write(_collectionKey);
+            foreach (KeyValuePair<CollectionInfo, ICollectionGenericObjects<T>> value in _storages)
+            {
+                StringBuilder sb = new();
+                sb.Append(Environment.NewLine);
+                if (value.Value.Count == 0)
+                {
+                    continue;
+                }
+
+                sb.Append(value.Key);
+                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);
+                }
+
+                writer.Write(sb);
+            }
+        }
+    }
+    /// <summary>
+    /// Загрузка информации по автомобилям в хранилище из файла
+    /// </summary>
+    /// <param name="filename">Путь и имя файла</param>
+    /// <returns>true - загрузка прошла успешно, false - ошибка при загрузке данных</returns>
+    public void LoadData(string filename)
+    {
+        if (!File.Exists(filename))
+        {
+            throw new FileNotFoundException(filename);
+        }
+
+        using (StreamReader fs = File.OpenText(filename))
+        {
+            string str = fs.ReadLine();
+            if (string.IsNullOrEmpty(str))
+            {
+                throw new EmptyFileExeption(filename);
+            }
+
+            if (!str.StartsWith(_collectionKey))
+            {
+                throw new FileFormatException(filename);
+            }
+
+            _storages.Clear();
+            string strs = "";
+            while ((strs = fs.ReadLine()) != null)
+            {
+                string[] record = strs.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
+                if (record.Length != 3)
+                {
+                    continue;
+                }
+
+                CollectionInfo? collectionInfo =
+                    CollectionInfo.GetCollectionInfo(record[0]) ??
+                    throw new CollectionInfoException("Не удалось определить информацию коллекции:" + record[0]);
+
+                ICollectionGenericObjects<T>? collection =
+                    StorageCollection<T>.CreateCollection(collectionInfo.CollectionType) ??
+                    throw new CollectionTypeException("Не удалось определить тип коллекции:" + record[1]);
+                collection.MaxCount = Convert.ToInt32(record[1]);
+
+                string[] set = record[2].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
+                foreach (string elem in set)
+                {
+                    if (elem?.CreateDrawningAircraft() is T ship)
+                    {
+                        try
+                        {
+                            collection.Insert(ship);
+                        }
+                        catch (Exception ex)
+                        {
+                            throw new FileFormatException(filename, ex);
+                        }
+                    }
+                }
+
+                _storages.Add(collectionInfo, collection);
+            }
+        }
+    }
+    private static ICollectionGenericObjects<T>?
+        CreateCollection(CollectionType collectionType)
+    {
+        return collectionType switch
+        {
+            CollectionType.Massive => new MassiveGenericObjects<T>(),
+            CollectionType.List => new ListGenericObjects<T>(),
+            _ => null,
+        };
+    }
+}
+

Stormtrooper/Stormtrooper/Drawnings/DrawningAircraft.cs

@@ -49,7 +49,7 @@ public class DrawningAircraft
     /// </summary>
     public int GetHeight => _drawningAircraftHeight;
 
-    // Пустой конструктор 
+    /// Пустой конструктор 
     private DrawningAircraft()
     {
         _pictureWidth = null;
@@ -77,6 +77,15 @@ public class DrawningAircraft
         _pictureHeight = drawningAircraftHeight;
     }
 
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="aircraft"></param>
+    public DrawningAircraft(EntityAircraft aircraft) : this()
+    {
+        EntityAircraft = new EntityAircraft(aircraft.Speed, aircraft.Weight, aircraft.BodyColor);
+    }
+
     /// Прорисовка объекта
     /// <param name="g"></param>
     /// // Установка границ поля

Stormtrooper/Stormtrooper/Drawnings/DrawningAircraftCompareByColor.cs

@@ -0,0 +1,37 @@
+using Stormtrooper.Drawnings;
+
+namespace Stormtrooper;
+
+public class DrawningAircraftCompareByColor : IComparer<DrawningAircraft?>
+{
+    public int Compare(DrawningAircraft? x, DrawningAircraft? y)
+    {
+        if (x == null && y == null) return 0;
+        if (x == null || x.EntityAircraft == null)
+        {
+            return 1;
+        }
+
+        if (y == null || y.EntityAircraft == null)
+        {
+            return -1;
+        }
+
+        if (ToHex(x.EntityAircraft.BodyColor) != ToHex(y.EntityAircraft.BodyColor))
+        {
+            return String.Compare(ToHex(x.EntityAircraft.BodyColor), ToHex(y.EntityAircraft.BodyColor),
+                StringComparison.Ordinal);
+        }
+
+        var speedCompare = x.EntityAircraft.Speed.CompareTo(y. EntityAircraft.Speed);
+        if (speedCompare != 0)
+        {
+            return speedCompare;
+        }
+
+        return x.EntityAircraft.Weight.CompareTo(y.EntityAircraft.Weight);
+    }
+
+    private static String ToHex(Color c)
+        => $"#{c.R:X2}{c.G:X2}{c.B:X2}";
+}

Stormtrooper/Stormtrooper/Drawnings/DrawningAircraftCompareByType.cs

@@ -0,0 +1,33 @@
+using Stormtrooper.Drawnings;
+
+namespace Stormtrooper;
+
+public class DrawningAircraftCompareByType : IComparer<DrawningAircraft?>
+{
+    public int Compare(DrawningAircraft? x, DrawningAircraft? y)
+    {
+        if (x == null && y == null) return 0;
+        if (x == null || x.EntityAircraft == null)
+        {
+            return 1;
+        }
+        
+        if (y == null || y.EntityAircraft == null)
+        {
+            return -1;
+        }
+
+        if (x.GetType().Name != y.GetType().Name)
+        {
+            return x.GetType().Name.CompareTo(y.GetType().Name);
+        }
+        
+        var speedCompare = x.EntityAircraft.Speed.CompareTo(y.EntityAircraft.Speed);
+        if (speedCompare != 0)
+        {
+            return speedCompare;
+        }
+        
+        return x.EntityAircraft.Weight.CompareTo(y.EntityAircraft.Weight);
+    }
+}

Stormtrooper/Stormtrooper/Drawnings/DrawningAircraftEquitables.cs

@@ -0,0 +1,59 @@
+using Stormtrooper.Entities;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Stormtrooper.Drawnings;
+
+public class DrawningAircraftEquitables : IEqualityComparer<DrawningAircraft?>
+{
+    public bool Equals(DrawningAircraft? x, DrawningAircraft? y)
+    {
+        if (ReferenceEquals(x, null)) return false;
+        if (ReferenceEquals(y, null)) return false;
+        if (x.GetType() != y.GetType()) return false;
+
+        if (x.GetType().Name != y.GetType().Name)
+        {
+            return false;
+        }
+
+        if (x.EntityAircraft != null && y.EntityAircraft != null && x.EntityAircraft.Speed != y.EntityAircraft.Speed)
+        {
+            return false;
+        }
+
+        if (x.EntityAircraft.Weight != y.EntityAircraft.Weight)
+        {
+            return false;
+        }
+
+        if (x.EntityAircraft.BodyColor != y.EntityAircraft.BodyColor)
+        {
+            return false;
+        }
+        if (x is DrawningStormtrooper && y is DrawningStormtrooper)
+        {
+            if (((EntityStormtrooper)x.EntityAircraft).AdditionalColor !=
+                ((EntityStormtrooper)y.EntityAircraft).AdditionalColor)
+            {
+                return false;
+            }
+            if (((EntityStormtrooper)x.EntityAircraft).Rocket!=
+                ((EntityStormtrooper)y.EntityAircraft).Rocket)
+            {
+                return false;
+            }
+            if (((EntityStormtrooper)x.EntityAircraft).Bomb!=
+                ((EntityStormtrooper)y.EntityAircraft).Bomb)
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public int GetHashCode([DisallowNull] DrawningAircraft obj)
+    {
+        return obj.GetHashCode();
+    }
+}

Stormtrooper/Stormtrooper/Drawnings/DrawningStormtrooper.cs

@@ -20,14 +20,22 @@ public class DrawningStormtrooper : DrawningAircraft
     /// <param name="additionalColor">Дополнительный цвет</param>
     /// <param name="rocket">Признак наличия ракет</param>
     /// <param name="bomb">Признак наличия бомбы</param>
-    /// <param name="wing">Признак наличия крыла</param>
     public DrawningStormtrooper(int speed, double weight, Color bodyColor, Color
-    additionalColor, bool rocket, bool bomb, bool wing) : base(140,135)
+    additionalColor, bool rocket, bool bomb) : base(140,135)
     {
-        EntityAircraft = new EntityStormtrooper(speed, weight, bodyColor, additionalColor, rocket, bomb, wing);
+        EntityAircraft = new EntityStormtrooper(speed, weight, bodyColor, additionalColor, rocket, bomb);
 
     }
 
+
+    public DrawningStormtrooper(EntityAircraft? entityAircraft) : base(140, 70)
+    {
+        if (entityAircraft != null)
+        {
+            EntityAircraft = entityAircraft;
+        }
+    }
+
     public override void DrawTransport(Graphics g)
     {
         if (EntityAircraft == null || EntityAircraft is not EntityStormtrooper entityStormtrooper|| !_startPosX.HasValue || !_startPosY.HasValue)

Stormtrooper/Stormtrooper/Drawnings/ExtentionDrawningAircraft.cs

@@ -0,0 +1,59 @@
+using Stormtrooper.Drawnings;
+using Stormtrooper.Entities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Stormtrooper.Drawnings;
+/// <summary>
+/// Расширение для класса EntityCar
+/// </summary>
+public static class ExtentionDrawningAircraft
+{
+    /// <summary>
+    /// Разделитель для записи информации по объекту в файл
+    /// </summary>
+    private static readonly string _separatorForObject = ":";
+
+    /// <summary>
+    /// Создание объекта из строки
+    /// </summary>
+    /// <param name="info">Строка с данными для создания объекта</param>
+    /// <returns>Объект</returns>
+    public static DrawningAircraft? CreateDrawningAircraft(this string info)
+    {
+        string[] strs = info.Split(_separatorForObject);
+        EntityAircraft? aircraft = EntityStormtrooper.CreateEntityStormtrooper(strs);
+        if (aircraft != null)
+        {
+            return new DrawningStormtrooper(aircraft);
+        }
+
+        aircraft = EntityAircraft.CreateEntityAicraft(strs);
+        if (aircraft != null)
+        {
+            return new DrawningAircraft(aircraft);
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    /// Получение данных для сохранения в файл
+    /// </summary>
+    /// <param name="drawningCar">Сохраняемый объект</param>
+    /// <returns>Строка с данными по объекту</returns>
+    public static string GetDataForSave(this DrawningAircraft drawningAircraft)
+    {
+        string[]? array = drawningAircraft?.EntityAircraft?.GetStringRepresentation();
+
+        if (array == null)
+        {
+            return string.Empty;
+        }
+
+        return string.Join(_separatorForObject, array);
+    }
+}

Stormtrooper/Stormtrooper/Entities/EntityAircraft.cs

@@ -17,6 +17,10 @@ public class EntityAircraft
     // вес
     public Color BodyColor { get; private set; }
     // цвет
+    public void SetBodyColor(Color bodyColor)
+    {
+        BodyColor = bodyColor;
+    }
     public double Step => Speed * 100 / Weight;
     // шаг в поле
     /// Конструктор сущности 
@@ -29,6 +33,29 @@ public class EntityAircraft
         Speed = speed;
         Weight = weight;
         BodyColor = bodyColor;
+    }
+    /// <summary>
+    /// Получение строк со значениями свойств объекта класса-сущности
+    /// </summary>
+    /// <returns></returns>
+    public virtual string[] GetStringRepresentation()
+    {
+        return new[] { nameof(EntityAircraft), Speed.ToString(), Weight.ToString(), BodyColor.Name };
+    }
 
+    /// <summary>
+    /// Создание объекта из массива строк
+    /// </summary>
+    /// <param name="strs"></param>
+    /// <returns></returns>
+    public static EntityAircraft? CreateEntityAicraft(string[] strs)
+    {
+        if (strs.Length != 4 || strs[0] != nameof(EntityAircraft))
+        {
+            return null;
+        }
+
+        return new EntityAircraft(Convert.ToInt32(strs[1]),
+            Convert.ToDouble(strs[2]), Color.FromName(strs[3]));
     }
 }

Stormtrooper/Stormtrooper/Entities/EntityStormtrooper.cs

@@ -8,20 +8,19 @@ namespace Stormtrooper.Entities;
 
 public class EntityStormtrooper : EntityAircraft
 {
-    public int Speed { get; private set; }
-    // скорость
-    public double Weight { get; private set; }
-    // вес
-    public Color BodyColor { get; private set; }
     // цвет
     public Color AdditionalColor { get; private set; }
+
+    public void SetAdditionalColor(Color additionalColor)
+    {
+        AdditionalColor = additionalColor;
+    }
     // дополнительные цвета
     public bool Rocket { get; private set; }
     // ракета
     public bool Bomb { get; private set; }
     // бомба
-    public bool Wing { get; private set; }
-    // крыло
+
 
     /// Инициализация полей объекта-класса штурмовика
 
@@ -31,14 +30,36 @@ public class EntityStormtrooper : EntityAircraft
     /// <param name="additionalColor">Дополнительный цвет</param>
     /// <param name="rocket">Признак наличия ракет</param>
     /// <param name="bomb">Признак наличия бомб</param>
-    /// <param name="wing">Признак наличия крыла а</param>
 
     public EntityStormtrooper(int speed, double weight, Color bodyColor, Color
-    additionalColor, bool rocket, bool bomb, bool wing) : base(speed, weight, bodyColor)
+    additionalColor, bool rocket, bool bomb) : base(speed, weight, bodyColor)
     {
         AdditionalColor = additionalColor;
         Rocket = rocket;
         Bomb = bomb;
-        Wing = wing;
+    }
+    /// <summary>
+    /// Получение строк со значениями свойств объекта класса-сущности
+    /// </summary>
+    /// <returns></returns>
+    public override string[] GetStringRepresentation()
+    {
+        return new[] { nameof(EntityStormtrooper), Speed.ToString(), Weight.ToString(),
+            BodyColor.Name, AdditionalColor.Name, Rocket.ToString(), Bomb.ToString() };
+    }
+
+    /// <summary>
+    /// Создание объекта из массива строк
+    /// </summary>
+    /// <param name="strs"></param>
+    /// <returns></returns>
+    public static EntityAircraft? CreateEntityStormtrooper(string[] strs)
+    {
+        if (strs.Length != 7 || strs[0] != nameof(EntityStormtrooper))
+        {
+            return null;
+        }
+        return new EntityStormtrooper(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]),
+            Color.FromName(strs[4]), Convert.ToBoolean(strs[5]), Convert.ToBoolean(strs[6]));
     }
 }

Stormtrooper/Stormtrooper/Exceptions/CollectionAlreadyExistsException.cs

@@ -0,0 +1,14 @@
+using System.Runtime.Serialization;
+
+
+namespace Stormtrooper;
+
+public class CollectionAlreadyExistsException : Exception
+{
+    public CollectionAlreadyExistsException() : base() { }
+    public CollectionAlreadyExistsException(CollectionInfo collectionInfo) : base($"Коллекция {collectionInfo} уже существует!") { }
+    public CollectionAlreadyExistsException(string name, Exception exception) :
+        base($"Коллекция {name} уже существует!", exception) { }
+    protected CollectionAlreadyExistsException(SerializationInfo info, StreamingContext
+        contex) : base(info, contex) { }
+}

Stormtrooper/Stormtrooper/Exceptions/CollectionInfoException.cs

@@ -0,0 +1,13 @@
+using System.Runtime.Serialization;
+
+namespace Stormtrooper;
+
+public class CollectionInfoException : Exception
+{
+    public CollectionInfoException() : base() { }
+    public CollectionInfoException(string message) : base(message) { }
+    public CollectionInfoException(string message, Exception exception) :
+        base(message, exception) { }
+    protected CollectionInfoException(SerializationInfo info, StreamingContext
+        contex) : base(info, contex) { }
+}

Stormtrooper/Stormtrooper/Exceptions/CollectionInsertException.cs

@@ -0,0 +1,13 @@
+using System.Runtime.Serialization;
+namespace Stormtrooper;
+
+public class CollectionInsertException : Exception
+{
+    public CollectionInsertException(object obj) : base($"Объект {obj} не удволетворяет уникальности") { }
+    public CollectionInsertException() : base() { }
+    public CollectionInsertException(string message) : base(message) { }
+    public CollectionInsertException(string message, Exception exception) :
+        base(message, exception) { }
+    protected CollectionInsertException(SerializationInfo info, StreamingContext
+        contex) : base(info, contex) { }
+}

Stormtrooper/Stormtrooper/Exceptions/CollectionOverflowException.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Stormtrooper.Exceptions;
+
+/// <summary>
+/// Класс, описывающий ошибку переполнения коллекции 
+/// </summary>
+[Serializable]
+public class CollectionOverflowException : ApplicationException
+{
+    public CollectionOverflowException(int count) : base("В коллекции превышено допустимое количество: " + count) { }
+
+    public CollectionOverflowException() : base() { }
+
+    public CollectionOverflowException(string message) : base(message) { }
+
+    public CollectionOverflowException(string message, Exception exception) : base(message, exception) { }
+
+    protected CollectionOverflowException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
+}

Stormtrooper/Stormtrooper/Exceptions/CollectionTypeException.cs

@@ -0,0 +1,14 @@
+using System.Runtime.Serialization;
+
+
+namespace Stormtrooper;
+
+public class CollectionTypeException : Exception
+{
+    public CollectionTypeException() : base() { }
+    public CollectionTypeException(string message) : base(message) { }
+    public CollectionTypeException(string message, Exception exception) :
+        base(message, exception) { }
+    protected CollectionTypeException(SerializationInfo info, StreamingContext
+        contex) : base(info, contex) { }
+}

Stormtrooper/Stormtrooper/Exceptions/DrawningEquitablesException.cs

@@ -0,0 +1,13 @@
+using System.Runtime.Serialization;
+
+namespace Stormtrooper;
+
+public class DrawningEquitablesException : Exception
+{
+    public DrawningEquitablesException() : base("Объекты прорисовки одинаковые") { }
+    public DrawningEquitablesException(string message) : base(message) { }
+    public DrawningEquitablesException(string message, Exception exception) :
+        base(message, exception) { }
+    protected DrawningEquitablesException(SerializationInfo info, StreamingContext
+        contex) : base(info, contex) { }
+}

Stormtrooper/Stormtrooper/Exceptions/EmptyFileExeption.cs

@@ -0,0 +1,14 @@
+using System.Runtime.Serialization;
+
+namespace Stormtrooper;
+
+public class EmptyFileExeption : Exception
+{
+    public EmptyFileExeption(string name) : base($"Файл {name} пустой ") { }
+    public EmptyFileExeption() : base("В хранилище отсутствуют коллекции для сохранения") { }
+    public EmptyFileExeption(string name, string message) : base(message) { }
+    public EmptyFileExeption(string name, string message, Exception exception) :
+        base(message, exception) { }
+    protected EmptyFileExeption(SerializationInfo info, StreamingContext
+        contex) : base(info, contex) { }
+}

Stormtrooper/Stormtrooper/Exceptions/FileFormatException.cs

@@ -0,0 +1,13 @@
+using System.Runtime.Serialization;
+
+namespace Stormtrooper;
+
+public class FileFormatException : Exception
+{
+    public FileFormatException() : base() { }
+    public FileFormatException(string message) : base(message) { }
+    public FileFormatException(string name, Exception exception) :
+        base($"Файл {name} имеет неверный формат. Ошибка: {exception.Message}", exception) { }
+    protected FileFormatException(SerializationInfo info, StreamingContext
+        contex) : base(info, contex) { }
+}

Stormtrooper/Stormtrooper/Exceptions/FileNotFoundException.cs

@@ -0,0 +1,14 @@
+using System.Runtime.Serialization;
+
+namespace Stormtrooper;
+
+public class FileNotFoundException : Exception
+{
+    public FileNotFoundException(string name) : base($"Файл {name} не существует ") { }
+    public FileNotFoundException() : base() { }
+    public FileNotFoundException(string name, string message) : base(message) { }
+    public FileNotFoundException(string name, string message, Exception exception) :
+        base(message, exception) { }
+    protected FileNotFoundException(SerializationInfo info, StreamingContext
+        contex) : base(info, contex) { }
+}

Stormtrooper/Stormtrooper/Exceptions/ObjectNotFoundException.cs

@@ -0,0 +1,21 @@
+using System.Runtime.Serialization;
+
+
+namespace Stormtrooper.Exceptions;
+
+/// <summary>
+/// Класс, описывающий ошибку, что по указанной позиции нет элемента
+/// </summary>
+[Serializable]
+internal class ObjectNotFoundException : ApplicationException
+{
+    public ObjectNotFoundException(int i) : base("Не найден объект по позиции " + i) { }
+
+    public ObjectNotFoundException() : base() { }
+
+    public ObjectNotFoundException(string message) : base(message) { }
+
+    public ObjectNotFoundException(string message, Exception exception) : base(message, exception) { }
+
+    protected ObjectNotFoundException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
+}

Stormtrooper/Stormtrooper/Exceptions/PositionOutOfCollectionException.cs

@@ -0,0 +1,21 @@
+using System.Runtime.Serialization;
+
+
+namespace Stormtrooper.Exceptions;
+
+/// <summary>
+/// Класс, описывающий ошибку выхода за границы коллекции
+/// </summary>
+[Serializable]
+internal class PositionOutOfCollectionException : ApplicationException
+{
+    public PositionOutOfCollectionException(int i) : base("Выход за границы коллекции. Позиция " + i) { }
+
+    public PositionOutOfCollectionException() : base() { }
+
+    public PositionOutOfCollectionException(string message) : base(message) { }
+
+    public PositionOutOfCollectionException(string message, Exception exception) : base(message, exception) { }
+
+    protected PositionOutOfCollectionException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
+}

Stormtrooper/Stormtrooper/FormAircraftCollection.Designer.cs

@@ -29,40 +29,107 @@
         private void InitializeComponent()
         {
             groupBoxTools = new GroupBox();
+            panelCompanyTools = new Panel();
+            buttonSortByColor = new Button();
+            buttonAddAiracft = new Button();
+            buttonSortByType = new Button();
             buttonRefresh = new Button();
+            maskedTextBox = new MaskedTextBox();
             buttonGoToCheck = new Button();
             buttonRemoveAircraft = new Button();
-            maskedTextBox = new MaskedTextBox();
-            buttonAddStormtrooper = new Button();
-            buttonAddAiracft = 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();
+            menuStrip = new MenuStrip();
+            fileToolStripMenuItem = new ToolStripMenuItem();
+            saveToolStripMenuItem = new ToolStripMenuItem();
+            loadToolStripMenuItem = new ToolStripMenuItem();
+            saveFileDialog = new SaveFileDialog();
+            openFileDialog = new OpenFileDialog();
+            pictureBox1 = new PictureBox();
             groupBoxTools.SuspendLayout();
+            panelCompanyTools.SuspendLayout();
+            panelStorage.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
+            menuStrip.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox1).BeginInit();
             SuspendLayout();
             // 
             // groupBoxTools
             // 
-            groupBoxTools.Controls.Add(buttonRefresh);
-            groupBoxTools.Controls.Add(buttonGoToCheck);
-            groupBoxTools.Controls.Add(buttonRemoveAircraft);
-            groupBoxTools.Controls.Add(maskedTextBox);
-            groupBoxTools.Controls.Add(buttonAddStormtrooper);
-            groupBoxTools.Controls.Add(buttonAddAiracft);
+            groupBoxTools.Controls.Add(panelCompanyTools);
+            groupBoxTools.Controls.Add(buttonCreateCompany);
+            groupBoxTools.Controls.Add(panelStorage);
             groupBoxTools.Controls.Add(comboBoxSelectorCompany);
             groupBoxTools.Dock = DockStyle.Right;
-            groupBoxTools.Location = new Point(980, 0);
+            groupBoxTools.Location = new Point(959, 28);
             groupBoxTools.Name = "groupBoxTools";
-            groupBoxTools.Size = new Size(264, 677);
+            groupBoxTools.Size = new Size(264, 714);
             groupBoxTools.TabIndex = 0;
             groupBoxTools.TabStop = false;
             groupBoxTools.Tag = "";
             groupBoxTools.Text = "Инструменты";
             // 
+            // panelCompanyTools
+            // 
+            panelCompanyTools.Controls.Add(buttonSortByColor);
+            panelCompanyTools.Controls.Add(buttonAddAiracft);
+            panelCompanyTools.Controls.Add(buttonSortByType);
+            panelCompanyTools.Controls.Add(buttonRefresh);
+            panelCompanyTools.Controls.Add(maskedTextBox);
+            panelCompanyTools.Controls.Add(buttonGoToCheck);
+            panelCompanyTools.Controls.Add(buttonRemoveAircraft);
+            panelCompanyTools.Enabled = false;
+            panelCompanyTools.Location = new Point(3, 391);
+            panelCompanyTools.Name = "panelCompanyTools";
+            panelCompanyTools.Size = new Size(258, 323);
+            panelCompanyTools.TabIndex = 9;
+            // 
+            // buttonSortByColor
+            // 
+            buttonSortByColor.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonSortByColor.Location = new Point(3, 272);
+            buttonSortByColor.Name = "buttonSortByColor";
+            buttonSortByColor.Size = new Size(252, 41);
+            buttonSortByColor.TabIndex = 9;
+            buttonSortByColor.Text = "Сортировка по цвету";
+            buttonSortByColor.UseVisualStyleBackColor = true;
+            buttonSortByColor.Click += ButtonSortByColor_Click;
+            // 
+            // buttonAddAiracft
+            // 
+            buttonAddAiracft.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddAiracft.Location = new Point(3, 3);
+            buttonAddAiracft.Name = "buttonAddAiracft";
+            buttonAddAiracft.Size = new Size(252, 41);
+            buttonAddAiracft.TabIndex = 1;
+            buttonAddAiracft.Text = "Добавление самолета";
+            buttonAddAiracft.UseVisualStyleBackColor = true;
+            buttonAddAiracft.Click += ButtonAddAircraft_Click;
+            // 
+            // buttonSortByType
+            // 
+            buttonSortByType.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonSortByType.Location = new Point(3, 225);
+            buttonSortByType.Name = "buttonSortByType";
+            buttonSortByType.Size = new Size(252, 41);
+            buttonSortByType.TabIndex = 8;
+            buttonSortByType.Text = "Сортировка по типу";
+            buttonSortByType.UseVisualStyleBackColor = true;
+            buttonSortByType.Click += ButtonSortByType_Click;
+            // 
             // buttonRefresh
             // 
             buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRefresh.Location = new Point(6, 601);
+            buttonRefresh.Location = new Point(3, 178);
             buttonRefresh.Name = "buttonRefresh";
             buttonRefresh.Size = new Size(252, 41);
             buttonRefresh.TabIndex = 6;
@@ -70,10 +137,20 @@
             buttonRefresh.UseVisualStyleBackColor = true;
             buttonRefresh.Click += ButtonRefresh_Click;
             // 
+            // maskedTextBox
+            // 
+            maskedTextBox.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            maskedTextBox.Location = new Point(3, 51);
+            maskedTextBox.Mask = "00";
+            maskedTextBox.Name = "maskedTextBox";
+            maskedTextBox.Size = new Size(252, 27);
+            maskedTextBox.TabIndex = 3;
+            maskedTextBox.ValidatingType = typeof(int);
+            // 
             // buttonGoToCheck
             // 
             buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonGoToCheck.Location = new Point(6, 493);
+            buttonGoToCheck.Location = new Point(3, 131);
             buttonGoToCheck.Name = "buttonGoToCheck";
             buttonGoToCheck.Size = new Size(252, 41);
             buttonGoToCheck.TabIndex = 5;
@@ -84,7 +161,7 @@
             // buttonRemoveAircraft
             // 
             buttonRemoveAircraft.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRemoveAircraft.Location = new Point(6, 323);
+            buttonRemoveAircraft.Location = new Point(3, 84);
             buttonRemoveAircraft.Name = "buttonRemoveAircraft";
             buttonRemoveAircraft.Size = new Size(252, 41);
             buttonRemoveAircraft.TabIndex = 4;
@@ -92,37 +169,97 @@
             buttonRemoveAircraft.UseVisualStyleBackColor = true;
             buttonRemoveAircraft.Click += ButtonRemoveAircraft_Click;
             // 
-            // maskedTextBox
+            // buttonCreateCompany
             // 
-            maskedTextBox.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            maskedTextBox.Location = new Point(6, 274);
-            maskedTextBox.Mask = "00";
-            maskedTextBox.Name = "maskedTextBox";
-            maskedTextBox.Size = new Size(252, 27);
-            maskedTextBox.TabIndex = 3;
-            maskedTextBox.ValidatingType = typeof(int);
+            buttonCreateCompany.Location = new Point(6, 356);
+            buttonCreateCompany.Name = "buttonCreateCompany";
+            buttonCreateCompany.Size = new Size(252, 29);
+            buttonCreateCompany.TabIndex = 8;
+            buttonCreateCompany.Text = "Создать компанию";
+            buttonCreateCompany.UseVisualStyleBackColor = true;
+            buttonCreateCompany.Click += ButtonCreateCompany_Click;
             // 
-            // buttonAddStormtrooper
+            // panelStorage
             // 
-            buttonAddStormtrooper.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonAddStormtrooper.Location = new Point(6, 172);
-            buttonAddStormtrooper.Name = "buttonAddStormtrooper";
-            buttonAddStormtrooper.Size = new Size(252, 41);
-            buttonAddStormtrooper.TabIndex = 2;
-            buttonAddStormtrooper.Text = "Добавление штурмовика";
-            buttonAddStormtrooper.UseVisualStyleBackColor = true;
-            buttonAddStormtrooper.Click += ButtonAddStormtrooper_Click;
+            panelStorage.Controls.Add(buttonCollectionDel);
+            panelStorage.Controls.Add(listBoxCollection);
+            panelStorage.Controls.Add(buttonCollectionAdd);
+            panelStorage.Controls.Add(radioButtonList);
+            panelStorage.Controls.Add(radioButtonMassive);
+            panelStorage.Controls.Add(textBoxCollectionName);
+            panelStorage.Controls.Add(labelCollectionName);
+            panelStorage.Dock = DockStyle.Top;
+            panelStorage.Location = new Point(3, 23);
+            panelStorage.Name = "panelStorage";
+            panelStorage.Size = new Size(258, 284);
+            panelStorage.TabIndex = 7;
             // 
-            // buttonAddAiracft
+            // buttonCollectionDel
             // 
-            buttonAddAiracft.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonAddAiracft.Location = new Point(6, 116);
-            buttonAddAiracft.Name = "buttonAddAiracft";
-            buttonAddAiracft.Size = new Size(252, 41);
-            buttonAddAiracft.TabIndex = 1;
-            buttonAddAiracft.Text = "Добавление самолета";
-            buttonAddAiracft.UseVisualStyleBackColor = true;
-            buttonAddAiracft.Click += ButtonAddAircraft_Click;
+            buttonCollectionDel.Location = new Point(3, 249);
+            buttonCollectionDel.Name = "buttonCollectionDel";
+            buttonCollectionDel.Size = new Size(252, 29);
+            buttonCollectionDel.TabIndex = 6;
+            buttonCollectionDel.Text = "Удалить коллекцию";
+            buttonCollectionDel.UseVisualStyleBackColor = true;
+            buttonCollectionDel.Click += ButtonCollectionDel_Click;
+            // 
+            // listBoxCollection
+            // 
+            listBoxCollection.FormattingEnabled = true;
+            listBoxCollection.ItemHeight = 20;
+            listBoxCollection.Location = new Point(3, 139);
+            listBoxCollection.Name = "listBoxCollection";
+            listBoxCollection.Size = new Size(252, 104);
+            listBoxCollection.TabIndex = 5;
+            // 
+            // buttonCollectionAdd
+            // 
+            buttonCollectionAdd.Location = new Point(3, 104);
+            buttonCollectionAdd.Name = "buttonCollectionAdd";
+            buttonCollectionAdd.Size = new Size(252, 29);
+            buttonCollectionAdd.TabIndex = 4;
+            buttonCollectionAdd.Text = "Добавить коллекцию";
+            buttonCollectionAdd.UseVisualStyleBackColor = true;
+            buttonCollectionAdd.Click += ButtonCollectionAdd_Click;
+            // 
+            // radioButtonList
+            // 
+            radioButtonList.AutoSize = true;
+            radioButtonList.Location = new Point(126, 74);
+            radioButtonList.Name = "radioButtonList";
+            radioButtonList.Size = new Size(80, 24);
+            radioButtonList.TabIndex = 3;
+            radioButtonList.TabStop = true;
+            radioButtonList.Text = "Список";
+            radioButtonList.UseVisualStyleBackColor = true;
+            // 
+            // radioButtonMassive
+            // 
+            radioButtonMassive.AutoSize = true;
+            radioButtonMassive.Location = new Point(38, 74);
+            radioButtonMassive.Name = "radioButtonMassive";
+            radioButtonMassive.Size = new Size(82, 24);
+            radioButtonMassive.TabIndex = 2;
+            radioButtonMassive.TabStop = true;
+            radioButtonMassive.Text = "Массив";
+            radioButtonMassive.UseVisualStyleBackColor = true;
+            // 
+            // textBoxCollectionName
+            // 
+            textBoxCollectionName.Location = new Point(3, 37);
+            textBoxCollectionName.Name = "textBoxCollectionName";
+            textBoxCollectionName.Size = new Size(252, 27);
+            textBoxCollectionName.TabIndex = 1;
+            // 
+            // labelCollectionName
+            // 
+            labelCollectionName.AutoSize = true;
+            labelCollectionName.Location = new Point(50, 14);
+            labelCollectionName.Name = "labelCollectionName";
+            labelCollectionName.Size = new Size(158, 20);
+            labelCollectionName.TabIndex = 0;
+            labelCollectionName.Text = "Название коллекции:";
             // 
             // comboBoxSelectorCompany
             // 
@@ -130,7 +267,7 @@
             comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
             comboBoxSelectorCompany.FormattingEnabled = true;
             comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
-            comboBoxSelectorCompany.Location = new Point(6, 26);
+            comboBoxSelectorCompany.Location = new Point(6, 322);
             comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
             comboBoxSelectorCompany.Size = new Size(252, 28);
             comboBoxSelectorCompany.TabIndex = 0;
@@ -139,37 +276,115 @@
             // pictureBox
             // 
             pictureBox.Dock = DockStyle.Fill;
-            pictureBox.Location = new Point(0, 0);
+            pictureBox.Location = new Point(0, 28);
             pictureBox.Name = "pictureBox";
-            pictureBox.Size = new Size(980, 677);
+            pictureBox.Size = new Size(959, 714);
             pictureBox.TabIndex = 1;
             pictureBox.TabStop = false;
             // 
+            // menuStrip
+            // 
+            menuStrip.ImageScalingSize = new Size(20, 20);
+            menuStrip.Items.AddRange(new ToolStripItem[] { fileToolStripMenuItem });
+            menuStrip.Location = new Point(0, 0);
+            menuStrip.Name = "menuStrip";
+            menuStrip.Size = new Size(1223, 28);
+            menuStrip.TabIndex = 2;
+            menuStrip.Text = "menuStrip1";
+            // 
+            // fileToolStripMenuItem
+            // 
+            fileToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { saveToolStripMenuItem, loadToolStripMenuItem });
+            fileToolStripMenuItem.Name = "fileToolStripMenuItem";
+            fileToolStripMenuItem.Size = new Size(59, 24);
+            fileToolStripMenuItem.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";
+            // 
+            // pictureBox1
+            // 
+            pictureBox1.Dock = DockStyle.Fill;
+            pictureBox1.Location = new Point(0, 28);
+            pictureBox1.Name = "pictureBox1";
+            pictureBox1.Size = new Size(959, 714);
+            pictureBox1.TabIndex = 7;
+            pictureBox1.TabStop = false;
+            // 
             // FormAircraftCollection
             // 
             AutoScaleDimensions = new SizeF(8F, 20F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(1244, 677);
+            ClientSize = new Size(1223, 742);
+            Controls.Add(pictureBox1);
             Controls.Add(pictureBox);
             Controls.Add(groupBoxTools);
+            Controls.Add(menuStrip);
+            MainMenuStrip = menuStrip;
             Name = "FormAircraftCollection";
             Text = "Коллекция самолетов";
             groupBoxTools.ResumeLayout(false);
-            groupBoxTools.PerformLayout();
+            panelCompanyTools.ResumeLayout(false);
+            panelCompanyTools.PerformLayout();
+            panelStorage.ResumeLayout(false);
+            panelStorage.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
+            menuStrip.ResumeLayout(false);
+            menuStrip.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox1).EndInit();
             ResumeLayout(false);
+            PerformLayout();
         }
 
         #endregion
 
         private GroupBox groupBoxTools;
         private ComboBox comboBoxSelectorCompany;
-        private Button buttonAddStormtrooper;
         private Button buttonAddAiracft;
         private Button buttonRemoveAircraft;
         private MaskedTextBox maskedTextBox;
         private PictureBox pictureBox;
         private Button buttonRefresh;
         private Button buttonGoToCheck;
+        private Panel panelStorage;
+        private TextBox textBoxCollectionName;
+        private Label labelCollectionName;
+        private RadioButton radioButtonList;
+        private RadioButton radioButtonMassive;
+        private Button buttonCreateCompany;
+        private Button buttonCollectionDel;
+        private ListBox listBoxCollection;
+        private Button buttonCollectionAdd;
+        private Panel panelCompanyTools;
+        private MenuStrip menuStrip;
+        private ToolStripMenuItem fileToolStripMenuItem;
+        private ToolStripMenuItem saveToolStripMenuItem;
+        private ToolStripMenuItem loadToolStripMenuItem;
+        private SaveFileDialog saveFileDialog;
+        private OpenFileDialog openFileDialog;
+        private Button buttonSortByColor;
+        private Button buttonSortByType;
+        private PictureBox pictureBox1;
     }
 }

Stormtrooper/Stormtrooper/FormAircraftCollection.cs

@@ -1,9 +1,12 @@
-using Stormtrooper.CollectionGenericObjects;
+using Microsoft.Extensions.Logging;
+using Stormtrooper.CollectionGenericObjects;
 using Stormtrooper.Drawnings;
+using Stormtrooper.Exceptions;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
+using System.Diagnostics.Contracts;
 using System.Drawing;
 using System.Linq;
 using System.Text;
@@ -14,16 +17,29 @@ namespace Stormtrooper;
 
 public partial class FormAircraftCollection : Form
 {
+    /// <summary>
+    /// Хранилище коллекций
+    /// </summary>
+    private readonly StorageCollection<DrawningAircraft> _storageCollection;
+
     /// <summary>
     /// Компания
     /// </summary>
-    private AbstractCompany? _company = null;
+    private AbstractCompany? _company;
+
+    /// <summary>
+    /// Логер
+    /// </summary>
+    private readonly ILogger _logger;
+
     /// <summary>
     /// Конструктор
     /// </summary>
-    public FormAircraftCollection()
+    public FormAircraftCollection(ILogger<FormAircraftCollection> logger)
     {
         InitializeComponent();
+        _storageCollection = new();
+        _logger = logger;
     }
 
     private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
@@ -31,95 +47,81 @@ public partial class FormAircraftCollection : Form
         switch (comboBoxSelectorCompany.Text)
         {
             case "Хранилище":
-                _company = new AircraftHangarService(pictureBox.Width,
-                pictureBox.Height, new MassiveGenericObjects<DrawningAircraft>());
+                _company = new AircraftHangarService(pictureBox1.Width, pictureBox1.Height,
+                    new MassiveGenericObjects<DrawningAircraft>());
                 break;
         }
     }
 
     /// <summary>
-    /// Создание объекта класса-перемещения
-    /// </summary>
-    /// <param name="type">Тип создаваемого объекта</param>
-    private void CreateObject(string type)
+    /// Добавление самолета
+    /// /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonAddAircraft_Click(object sender, EventArgs e)
     {
-        if (_company == null)
+        FormAircraftConfig form = new();
+        //TODO Передать метод
+        form.Show();
+        form.AddEvent(SetAircraft);
+    }
+
+    /// <summary>
+    /// Добавление самолета в коллекцию
+    /// </summary>
+    /// <param name="aircraft"></param>
+    private void SetAircraft(DrawningAircraft aircraft)
+    {
+        if (_company == null || aircraft == null)
         {
             return;
         }
-        Random random = new();
-        DrawningAircraft drawningAircraft;
-        switch (type)
-        {
-            case nameof(DrawningAircraft):
-                drawningAircraft = new DrawningAircraft(random.Next(100, 300), random.Next(1000, 3000), GetColor(random));
-                break;
-            case nameof(DrawningStormtrooper):
-                drawningAircraft = new DrawningStormtrooper(random.Next(100, 300), random.Next(1000, 3000),
-            GetColor(random),GetColor(random),Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
-                break;
-            default:
-                return;
-        }
-        if (_company + drawningAircraft != -1)
+        try
         {
+            var res = _company + aircraft;
             MessageBox.Show("Объект добавлен");
-            pictureBox.Image = _company.Show();
+            _logger.LogInformation($"Объект добавлен под индексом {res}");
+            pictureBox1.Image = _company.Show();
         }
-        else
+        catch (Exception ex)
         {
-            MessageBox.Show("Не удалось добавить объект");
+            MessageBox.Show($"Объект не добавлен: {ex.Message}", "Результат", MessageBoxButtons.OK,
+                MessageBoxIcon.Error);
+            _logger.LogError($"Ошибка: {ex.Message}", ex.Message);
         }
     }
 
     /// <summary>
-    /// Получение цвета
+    /// Кнопка удаления самолета
     /// </summary>
-    /// <param name="random">Генератор случайных чисел</param>
-    /// <returns></returns>
-    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 ButtonAddAircraft_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningAicraft));
-    //private void ButtonStormtrooper_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningStormtrooper));
-    private void ButtonAddAircraft_Click(object sender, EventArgs e)
-    {
-        CreateObject(nameof(DrawningAircraft));
-    }
-
-    private void ButtonAddStormtrooper_Click(object sender, EventArgs e)
-    {
-        CreateObject(nameof(DrawningStormtrooper));
-    }
-
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
     private void ButtonRemoveAircraft_Click(object sender, EventArgs e)
     {
         if (string.IsNullOrEmpty(maskedTextBox.Text) || _company == null)
         {
             return;
         }
-        if (MessageBox.Show("Удалить объект?", "Удаление",
-        MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
+
+        if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) !=
+            DialogResult.Yes)
         {
             return;
         }
+
         int pos = Convert.ToInt32(maskedTextBox.Text);
-        if (_company - pos != null)
+        try
         {
-            MessageBox.Show("Объект удален!");
-            pictureBox.Image = _company.Show();
+            var res = _company - pos;
+            MessageBox.Show("Объект удален");
+            _logger.LogInformation($"Объект удален под индексом {pos}");
+            pictureBox1.Image = _company.Show();
         }
-        else
+        catch (Exception ex)
         {
-            MessageBox.Show("Не удалось удалить объект");
+            MessageBox.Show(ex.Message, "Не удалось удалить объект",
+                MessageBoxButtons.OK, MessageBoxIcon.Error);
+            _logger.LogError($"Ошибка: {ex.Message}", ex.Message);
         }
     }
 
@@ -159,6 +161,201 @@ public partial class FormAircraftCollection : Form
             return;
         }
 
-        pictureBox.Image = _company.Show();
+        pictureBox1.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;
+        }
+
+        try
+        {
+            _storageCollection.AddCollection(new CollectionInfo(textBoxCollectionName.Text, collectionType, "2"));
+            _logger.LogInformation("Добавление коллекции");
+            RerfreshListBoxItems();
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            _logger.LogError($"Ошибка: {ex.Message}", ex.Message);
+        }
+    }
+
+    /// <summary>
+    /// Удаление коллекции 
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonCollectionDel_Click(object sender, EventArgs e)
+    {
+        if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
+        {
+            MessageBox.Show("Коллекция не выбрана");
+            return;
+        }
+
+        if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) !=
+            DialogResult.Yes)
+        {
+            return;
+        }
+
+        CollectionInfo? collectionInfo = CollectionInfo.GetCollectionInfo(listBoxCollection.SelectedItem.ToString()!);
+        _storageCollection.DelCollection(collectionInfo!);
+        _logger.LogInformation("Коллекция удалена");
+        RerfreshListBoxItems();
+    }
+
+
+    /// <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<DrawningAircraft>? collection =
+            _storageCollection[
+                CollectionInfo.GetCollectionInfo(listBoxCollection.SelectedItem.ToString()!) ??
+                new CollectionInfo("", CollectionType.None, "")];
+        if (collection == null)
+        {
+            MessageBox.Show("Коллекция не проинициализирована");
+            return;
+        }
+
+        switch (comboBoxSelectorCompany.Text)
+        {
+            case "Хранилище":
+                _company = new AircraftHangarService(pictureBox1.Width, pictureBox1.Height, collection);
+                _logger.LogInformation("Компания создана");
+                break;
+        }
+
+        panelCompanyTools.Enabled = true;
+        RerfreshListBoxItems();
+    }
+    /// <summary>
+    /// Обновление списка в listBoxCollection
+    /// </summary>
+    private void RerfreshListBoxItems()
+    {
+        listBoxCollection.Items.Clear();
+        for (int i = 0; i < _storageCollection.Keys?.Count; ++i)
+        {
+            CollectionInfo? col = _storageCollection.Keys?[i];
+            if (!col!.IsEmpty())
+            {
+                listBoxCollection.Items.Add(col);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Обработка нажатия "Сохранить"
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void SaveToolStripMenuItem_Click(object sender, EventArgs e)
+    {
+        if (saveFileDialog.ShowDialog() == DialogResult.OK)
+        {
+            try
+            {
+                _storageCollection.SaveData(saveFileDialog.FileName);
+                MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                _logger.LogInformation("Сохранение в файл: {filename}", saveFileDialog.FileName);
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show("Не сохранилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                _logger.LogError("Ошибка: {Message}", ex.Message);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Обработка нажатия "Загрузка"
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void loadToolStripMenuItem_Click(object sender, EventArgs e)
+    {
+        if (openFileDialog.ShowDialog() == DialogResult.OK)
+        {
+            try
+            {
+                _storageCollection.LoadData(openFileDialog.FileName);
+                RerfreshListBoxItems();
+                MessageBox.Show("Загрузка прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                _logger.LogInformation("Загрузка из файла: {filename}", openFileDialog.FileName);
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show("Загрузка не выполнена", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                _logger.LogError("Ошибка: {Message}", ex.Message);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Сортировка по типу
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonSortByType_Click(object sender, EventArgs e)
+    {
+        CompareAircrafts(new DrawningAircraftCompareByType());
+    }
+
+    /// <summary>
+    /// Сортировка по цвету
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonSortByColor_Click(object sender, EventArgs e)
+    {
+        CompareAircrafts(new DrawningAircraftCompareByColor());
+    }
+
+    /// <summary>
+    /// Сортировка по сравнителю
+    /// </summary>
+    /// <param name="comparer">Сравнитель объектов</param>
+    private void CompareAircrafts(IComparer<DrawningAircraft?> comparer)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+
+        _company.Sort(comparer);
+        pictureBox1.Image = _company.Show();
     }
 }

Stormtrooper/Stormtrooper/FormAircraftCollection.resx

@@ -117,4 +117,16 @@
   <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, 1</value>
+  </metadata>
+  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>145, 1</value>
+  </metadata>
+  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>310, 1</value>
+  </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>25</value>
+  </metadata>
 </root>

Stormtrooper/Stormtrooper/FormAircraftConfig.Designer.cs

@@ -0,0 +1,357 @@
+namespace Stormtrooper
+{
+    partial class FormAircraftConfig
+    {
+        /// <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();
+            panelPurple = new Panel();
+            panelBlack = new Panel();
+            panelGray = new Panel();
+            panelWhite = new Panel();
+            panelBlue = new Panel();
+            panelGreen = new Panel();
+            panelYellow = new Panel();
+            panelRed = new Panel();
+            checkBoxBomb = new CheckBox();
+            checkBoxRocket = new CheckBox();
+            numericUpDownWeight = new NumericUpDown();
+            labelWeight = new Label();
+            numericUpDownSpeed = new NumericUpDown();
+            labelSpeed = new Label();
+            labelModifiedObject = new Label();
+            labelSimpleObject = new Label();
+            pictureBoxObject = new PictureBox();
+            buttonCancel = new Button();
+            buttonAdd = 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(checkBoxBomb);
+            groupBoxConfig.Controls.Add(checkBoxRocket);
+            groupBoxConfig.Controls.Add(numericUpDownWeight);
+            groupBoxConfig.Controls.Add(labelWeight);
+            groupBoxConfig.Controls.Add(numericUpDownSpeed);
+            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(590, 247);
+            groupBoxConfig.TabIndex = 0;
+            groupBoxConfig.TabStop = false;
+            groupBoxConfig.Text = "Параметры";
+            // 
+            // groupBoxColors
+            // 
+            groupBoxColors.Controls.Add(panelPurple);
+            groupBoxColors.Controls.Add(panelBlack);
+            groupBoxColors.Controls.Add(panelGray);
+            groupBoxColors.Controls.Add(panelWhite);
+            groupBoxColors.Controls.Add(panelBlue);
+            groupBoxColors.Controls.Add(panelGreen);
+            groupBoxColors.Controls.Add(panelYellow);
+            groupBoxColors.Controls.Add(panelRed);
+            groupBoxColors.Location = new Point(275, 26);
+            groupBoxColors.Name = "groupBoxColors";
+            groupBoxColors.Size = new Size(290, 127);
+            groupBoxColors.TabIndex = 9;
+            groupBoxColors.TabStop = false;
+            groupBoxColors.Text = "Цвета";
+            // 
+            // panelPurple
+            // 
+            panelPurple.BackColor = Color.Purple;
+            panelPurple.Location = new Point(226, 80);
+            panelPurple.Name = "panelPurple";
+            panelPurple.Size = new Size(43, 39);
+            panelPurple.TabIndex = 2;
+            // 
+            // panelBlack
+            // 
+            panelBlack.BackColor = Color.Black;
+            panelBlack.Location = new Point(159, 80);
+            panelBlack.Name = "panelBlack";
+            panelBlack.Size = new Size(43, 39);
+            panelBlack.TabIndex = 3;
+            // 
+            // panelGray
+            // 
+            panelGray.BackColor = Color.Gray;
+            panelGray.Location = new Point(92, 80);
+            panelGray.Name = "panelGray";
+            panelGray.Size = new Size(43, 39);
+            panelGray.TabIndex = 2;
+            // 
+            // panelWhite
+            // 
+            panelWhite.BackColor = Color.White;
+            panelWhite.Location = new Point(25, 80);
+            panelWhite.Name = "panelWhite";
+            panelWhite.Size = new Size(43, 39);
+            panelWhite.TabIndex = 1;
+            // 
+            // panelBlue
+            // 
+            panelBlue.BackColor = Color.Blue;
+            panelBlue.Location = new Point(159, 21);
+            panelBlue.Name = "panelBlue";
+            panelBlue.Size = new Size(43, 39);
+            panelBlue.TabIndex = 2;
+            // 
+            // panelGreen
+            // 
+            panelGreen.BackColor = Color.Green;
+            panelGreen.Location = new Point(92, 21);
+            panelGreen.Name = "panelGreen";
+            panelGreen.Size = new Size(43, 39);
+            panelGreen.TabIndex = 1;
+            // 
+            // panelYellow
+            // 
+            panelYellow.BackColor = Color.Yellow;
+            panelYellow.Location = new Point(226, 21);
+            panelYellow.Name = "panelYellow";
+            panelYellow.Size = new Size(43, 39);
+            panelYellow.TabIndex = 1;
+            // 
+            // panelRed
+            // 
+            panelRed.BackColor = Color.Red;
+            panelRed.Location = new Point(25, 21);
+            panelRed.Name = "panelRed";
+            panelRed.Size = new Size(43, 39);
+            panelRed.TabIndex = 0;
+            // 
+            // checkBoxBomb
+            // 
+            checkBoxBomb.AutoSize = true;
+            checkBoxBomb.Location = new Point(20, 179);
+            checkBoxBomb.Name = "checkBoxBomb";
+            checkBoxBomb.Size = new Size(196, 24);
+            checkBoxBomb.TabIndex = 8;
+            checkBoxBomb.Text = "Признак наличия бомб";
+            checkBoxBomb.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxRocket
+            // 
+            checkBoxRocket.AutoSize = true;
+            checkBoxRocket.Location = new Point(20, 131);
+            checkBoxRocket.Name = "checkBoxRocket";
+            checkBoxRocket.Size = new Size(196, 24);
+            checkBoxRocket.TabIndex = 6;
+            checkBoxRocket.Text = "Признак наличия ракет";
+            checkBoxRocket.UseVisualStyleBackColor = true;
+            // 
+            // numericUpDownWeight
+            // 
+            numericUpDownWeight.Location = new Point(103, 69);
+            numericUpDownWeight.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
+            numericUpDownWeight.Minimum = new decimal(new int[] { 100, 0, 0, 0 });
+            numericUpDownWeight.Name = "numericUpDownWeight";
+            numericUpDownWeight.Size = new Size(122, 27);
+            numericUpDownWeight.TabIndex = 5;
+            numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 });
+            // 
+            // labelWeight
+            // 
+            labelWeight.AutoSize = true;
+            labelWeight.Location = new Point(12, 69);
+            labelWeight.Name = "labelWeight";
+            labelWeight.Size = new Size(36, 20);
+            labelWeight.TabIndex = 4;
+            labelWeight.Text = "Вес:";
+            // 
+            // numericUpDownSpeed
+            // 
+            numericUpDownSpeed.Location = new Point(103, 34);
+            numericUpDownSpeed.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
+            numericUpDownSpeed.Minimum = new decimal(new int[] { 100, 0, 0, 0 });
+            numericUpDownSpeed.Name = "numericUpDownSpeed";
+            numericUpDownSpeed.Size = new Size(122, 27);
+            numericUpDownSpeed.TabIndex = 3;
+            numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 });
+            // 
+            // labelSpeed
+            // 
+            labelSpeed.AutoSize = true;
+            labelSpeed.Location = new Point(12, 34);
+            labelSpeed.Name = "labelSpeed";
+            labelSpeed.Size = new Size(76, 20);
+            labelSpeed.TabIndex = 2;
+            labelSpeed.Text = "Скорость:";
+            // 
+            // labelModifiedObject
+            // 
+            labelModifiedObject.BorderStyle = BorderStyle.FixedSingle;
+            labelModifiedObject.Location = new Point(422, 179);
+            labelModifiedObject.Name = "labelModifiedObject";
+            labelModifiedObject.Size = new Size(162, 36);
+            labelModifiedObject.TabIndex = 1;
+            labelModifiedObject.Text = "Продвинутый объект";
+            labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter;
+            labelModifiedObject.MouseDown += labelObject_MouseDown;
+            // 
+            // labelSimpleObject
+            // 
+            labelSimpleObject.BorderStyle = BorderStyle.FixedSingle;
+            labelSimpleObject.Location = new Point(254, 179);
+            labelSimpleObject.Name = "labelSimpleObject";
+            labelSimpleObject.Size = new Size(162, 36);
+            labelSimpleObject.TabIndex = 0;
+            labelSimpleObject.Text = "Простой объект";
+            labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter;
+            labelSimpleObject.MouseDown += labelObject_MouseDown;
+            // 
+            // pictureBoxObject
+            // 
+            pictureBoxObject.Location = new Point(12, 47);
+            pictureBoxObject.Name = "pictureBoxObject";
+            pictureBoxObject.Size = new Size(180, 153);
+            pictureBoxObject.TabIndex = 1;
+            pictureBoxObject.TabStop = false;
+            // 
+            // buttonCancel
+            // 
+            buttonCancel.Location = new Point(704, 206);
+            buttonCancel.Name = "buttonCancel";
+            buttonCancel.Size = new Size(84, 36);
+            buttonCancel.TabIndex = 3;
+            buttonCancel.Text = "Отмена";
+            buttonCancel.UseVisualStyleBackColor = true;
+            // 
+            // buttonAdd
+            // 
+            buttonAdd.Location = new Point(608, 206);
+            buttonAdd.Name = "buttonAdd";
+            buttonAdd.Size = new Size(84, 36);
+            buttonAdd.TabIndex = 4;
+            buttonAdd.Text = "Добавить";
+            buttonAdd.UseVisualStyleBackColor = true;
+            buttonAdd.Click += buttonAdd_Click;
+            // 
+            // panelObject
+            // 
+            panelObject.AllowDrop = true;
+            panelObject.Controls.Add(labelAdditionalColor);
+            panelObject.Controls.Add(labelBodyColor);
+            panelObject.Controls.Add(pictureBoxObject);
+            panelObject.Location = new Point(596, 0);
+            panelObject.Name = "panelObject";
+            panelObject.Size = new Size(203, 203);
+            panelObject.TabIndex = 5;
+            panelObject.DragDrop += panelObject_DragDrop;
+            panelObject.DragEnter += panelObject_DragEnter;
+            // 
+            // labelAdditionalColor
+            // 
+            labelAdditionalColor.AllowDrop = true;
+            labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle;
+            labelAdditionalColor.Location = new Point(105, 9);
+            labelAdditionalColor.Name = "labelAdditionalColor";
+            labelAdditionalColor.Size = new Size(87, 36);
+            labelAdditionalColor.TabIndex = 11;
+            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(12, 8);
+            labelBodyColor.Name = "labelBodyColor";
+            labelBodyColor.Size = new Size(87, 36);
+            labelBodyColor.TabIndex = 10;
+            labelBodyColor.Text = "Цвет";
+            labelBodyColor.TextAlign = ContentAlignment.MiddleCenter;
+            labelBodyColor.DragDrop += labelBodyColor_DragDrop;
+            labelBodyColor.DragEnter += labelBodyColor_DragEnter;
+            // 
+            // FormAircraftConfig
+            // 
+            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(800, 247);
+            Controls.Add(panelObject);
+            Controls.Add(buttonAdd);
+            Controls.Add(buttonCancel);
+            Controls.Add(groupBoxConfig);
+            Name = "FormAircraftConfig";
+            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 numericUpDownSpeed;
+        private Label labelSpeed;
+        private Label labelModifiedObject;
+        private NumericUpDown numericUpDownWeight;
+        private Label labelWeight;
+        private CheckBox checkBoxRocket;
+        private CheckBox checkBoxBomb;
+        private GroupBox groupBoxColors;
+        private Panel panelBlue;
+        private Panel panelGreen;
+        private Panel panelYellow;
+        private Panel panelRed;
+        private Panel panelPurple;
+        private Panel panelBlack;
+        private Panel panelGray;
+        private Panel panelWhite;
+        private PictureBox pictureBoxObject;
+        private Button buttonCancel;
+        private Button buttonAdd;
+        private Panel panelObject;
+        private Label labelAdditionalColor;
+        private Label labelBodyColor;
+    }
+}

Stormtrooper/Stormtrooper/FormAircraftConfig.cs

@@ -0,0 +1,168 @@
+using Stormtrooper.Drawnings;
+using Stormtrooper.Entities;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Stormtrooper;
+
+/// <summary>
+/// Форма конфигурации объекта
+/// </summary>
+public partial class FormAircraftConfig : Form
+{
+    /// <summary>
+    /// Объект - прорисовка самолета
+    /// </summary>
+    private DrawningAircraft? _aircraft;
+    private event Action<DrawningAircraft>? AircraftDelegate;
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public FormAircraftConfig()
+    {
+        InitializeComponent();
+
+        panelRed.MouseDown += panel_MouseDown;
+        panelGreen.MouseDown += panel_MouseDown;
+        panelBlue.MouseDown += panel_MouseDown;
+        panelYellow.MouseDown += panel_MouseDown;
+        panelWhite.MouseDown += panel_MouseDown;
+        panelGray.MouseDown += panel_MouseDown;
+        panelBlack.MouseDown += panel_MouseDown;
+        panelPurple.MouseDown += panel_MouseDown;
+        //TODO  buttonCancel.Click with lambda с закрытием формы
+        buttonCancel.Click += (sender, e) => Close();
+    }
+
+    /// <summary>
+    /// Событие для передачи объекта
+    /// </summary>
+    /// <param name="aircraftDelegate"></param>
+    public void AddEvent(Action<DrawningAircraft> aircraftDelegate)
+    {
+            AircraftDelegate += aircraftDelegate;
+    }
+
+    /// <summary>
+    /// Прорисовка объекта
+    /// </summary>
+    private void DrawObject()
+    {
+        Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
+        Graphics gr = Graphics.FromImage(bmp);
+        _aircraft?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height);
+        _aircraft?.SetPosition(5, 5);
+        _aircraft?.DrawTransport(gr);
+        pictureBoxObject.Image = bmp;
+    }
+
+    /// <summary>
+    /// Проверяем информацию при нажатии на Label
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void labelObject_MouseDown(object sender, MouseEventArgs e)
+    {
+        (sender as Label)?.DoDragDrop((sender as Label)?.Name ?? string.Empty, DragDropEffects.Move | DragDropEffects.Copy);
+    }
+
+    /// <summary>
+    /// Проверка полученной информации(ее типа на соответствие требоемому)
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void panelObject_DragEnter(object sender, DragEventArgs e)
+    {
+        e.Effect = e.Data?.GetDataPresent(DataFormats.Text) ?? false ? DragDropEffects.Copy : DragDropEffects.None;
+    }
+
+    /// <summary>
+    /// Действие при приеме перетаскиваемой информации
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void panelObject_DragDrop(object sender, DragEventArgs e)
+    {
+        switch (e.Data?.GetData(DataFormats.Text)?.ToString())
+        {
+            case "labelSimpleObject":
+                _aircraft = new DrawningAircraft((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White);
+                break;
+            case "labelModifiedObject":
+                _aircraft = new DrawningStormtrooper((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White, Color.Black, checkBoxRocket.Checked, checkBoxBomb.Checked);
+                break;
+        }
+        DrawObject();
+    }
+    private void panel_MouseDown(object? sender, MouseEventArgs e)
+    {
+        //TODO отправка цвета в Drag&Drop
+        (sender as Control)?.DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy);
+    }
+
+    //TODO реализовать логику смены цветов: основного и дополнительного (для продвинутого объекта)
+    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 labelBodyColor_DragDrop(object? sender, DragEventArgs e)
+    {
+        if (_aircraft != null)
+        {
+            _aircraft.EntityAircraft.SetBodyColor((Color)e.Data.GetData(typeof(Color)));
+            DrawObject();
+        }
+    }
+    private void labelAdditionalColor_DragEnter(object? sender, DragEventArgs e)
+    {
+        if (_aircraft is DrawningStormtrooper)
+        {
+            if (e.Data.GetDataPresent(typeof(Color)))
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+    }
+
+    private void labelAdditionalColor_DragDrop(object? sender, DragEventArgs e)
+    {
+        if (_aircraft.EntityAircraft is EntityStormtrooper stormtrooper)
+        {
+            stormtrooper.SetAdditionalColor((Color)e.Data.GetData(typeof(Color)));
+            DrawObject();
+        }
+    }
+    /// <summary>
+    /// Передача объекта
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void buttonAdd_Click(object sender, EventArgs e)
+    {
+        if (_aircraft != null)
+        {
+            AircraftDelegate?.Invoke(_aircraft);
+            Close();
+        }
+    }
+}

Stormtrooper/Stormtrooper/FormAircraftConfig.resx

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

Stormtrooper/Stormtrooper/FormStormtrooper.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
-using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;

Stormtrooper/Stormtrooper/FormStormtrooper.resx

@@ -18,7 +18,8 @@
     <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="Color1" type="System.Dra
+	.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>

Stormtrooper/Stormtrooper/Program.cs

@@ -1,17 +1,44 @@
-namespace Stormtrooper
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Configuration;
+using Serilog;
+
+
+namespace Stormtrooper;
+
+internal static class Program
 {
-    internal static class Program
+    [STAThread]
+    static void Main()
     {
-        /// <summary>
-        ///  The main entry point for the application.
-        /// </summary>
-        [STAThread]
-        static void Main()
+        // To customize application configuration such as set high DPI settings or default font,
+        // see https://aka.ms/applicationconfiguration.
+        ApplicationConfiguration.Initialize();
+        var services = new ServiceCollection();
+        ConfigureServices(services);
+        using (ServiceProvider serviceProvider = services.BuildServiceProvider())
         {
-            // To customize application configuration such as set high DPI settings or default font,
-            // see https://aka.ms/applicationconfiguration.
-            ApplicationConfiguration.Initialize();
-            Application.Run(new FormAircraftCollection());
+            Application.Run(serviceProvider.GetRequiredService<FormAircraftCollection>());
         }
     }
+
+    private static void ConfigureServices(ServiceCollection services)
+    {
+        services.AddSingleton<FormAircraftCollection>().AddLogging(option =>
+        {
+            string[] path = Directory.GetCurrentDirectory().Split('\\');
+            string pathNeed = "";
+            for (int i = 0; i < path.Length - 3; i++)
+            {
+                pathNeed += path[i] + "\\";
+            }
+
+            var configuration = new ConfigurationBuilder().SetBasePath(Directory.GetCurrentDirectory())
+                .AddJsonFile(path: $"{pathNeed}serilogConfig.json", optional: false, reloadOnChange: true)
+                .Build();
+            var logger = new LoggerConfiguration().ReadFrom.Configuration(configuration).CreateLogger();
+            option.SetMinimumLevel(LogLevel.Information);
+            option.AddSerilog(logger);
+        });
+    }
 }

Stormtrooper/Stormtrooper/Stormtrooper.csproj

@@ -8,6 +8,16 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+    <PackageReference Include="Serilog" Version="3.1.1" />
+    <PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
@@ -23,4 +33,10 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="serilogConfig.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>

Stormtrooper/Stormtrooper/serilogConfig.json

@@ -0,0 +1,20 @@
+{
+  "Serilog": {
+    "Using": [ "Serilog.Sinks.File" ],
+    "MinimumLevel": "Information",
+    "WriteTo": [
+      {
+        "Name": "File",
+        "Args": {
+          "path": "Logs/log_.log",
+          "rollingInterval": "Day",
+          "outputTemplate": "[{Timestamp:HH:mm:ss.fff}]{Level:u4}: {Message:lj}{NewLine}{Exception}"
+        }
+      }
+    ],
+    "Enrich": [ "FromLogContext", "WithMachineName", "WithThreadId" ],
+    "Properties": {
+      "Application": "Stormtrooper"
+    }
+  }
+}