ещё раз

111.txt

@@ -0,0 +1,2 @@
+CollectionsStorage
+111|Massive|45|EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;

AirFighter/AirFighter/CollectionGenericObjects/AbstractCompany.cs

@@ -1,4 +1,5 @@
 using ProjectAirFighter.Drawnings;
+using ProjectAirFighter.Exceptions;
 
 namespace ProjectAirFighter.CollectionGenericObjects;
 
@@ -59,7 +60,7 @@ public abstract class AbstractCompany
     /// <returns></returns>
     public static int operator +(AbstractCompany company, DrawningMilitaryAircraft militaryAircraft)
     {
-        return company._collection.Insert(militaryAircraft);
+        return company._collection.Insert(militaryAircraft, new DrawiningCarEqutables());
     }
 
     /// <summary>
@@ -95,14 +96,29 @@ public abstract class AbstractCompany
 
         SetObjectsPosition();
         for (int i = 0; i < (_collection?.Count ?? 0); ++i)
-        {
+        { 
+            try
+            { 
             DrawningMilitaryAircraft? obj = _collection?.Get(i);
             obj?.DrawTransport(graphics);
+            }
+            catch (ObjectNotFoundException e) 
+            { }
+            catch (PositionOutOfCollectionException e)
+            { }
+            catch (CollectionOverflowException e)
+            { }
         }
 
         return bitmap;
     }
 
+    /// <summary>
+	/// Сортировка
+	/// </summary>
+	/// <param name="comparer">Сравнитель объектов</param>
+	public void Sort(IComparer<DrawningMilitaryAircraft?> comparer) => _collection?.CollectionSort(comparer);
+
     /// <summary>
     /// Вывод заднего фона
     /// </summary>

AirFighter/AirFighter/CollectionGenericObjects/Angar.cs

@@ -1,4 +1,5 @@
 using ProjectAirFighter.Drawnings;
+using ProjectAirFighter.Exceptions;
 
 namespace ProjectAirFighter.CollectionGenericObjects;
 
@@ -42,11 +43,13 @@ public class Angar : AbstractCompany
 
         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--;
@@ -55,7 +58,7 @@ public class Angar : AbstractCompany
                 curWidth = width - 1;
                 curHeight--;
             }
-            if (curHeight > height)
+            if (curHeight >= height)
             {
                 return;
             }

AirFighter/AirFighter/CollectionGenericObjects/CollectionInfo.cs

@@ -0,0 +1,84 @@
+using ProjectAirFighter.CollectionGenericObjects;
+
+namespace AirFighter;
+
+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();
+    }
+}

AirFighter/AirFighter/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -1,4 +1,6 @@
-namespace ProjectAirFighter.CollectionGenericObjects;
+using ProjectAirFighter.Drawnings;
+
+namespace ProjectAirFighter.CollectionGenericObjects;
 
 /// <summary>
 /// Интерфейс описания действий для набора хранимых объектов
@@ -15,14 +17,14 @@ public interface ICollectionGenericObjects<T>
     /// <summary>
     /// Установка максимального количества элементов
     /// </summary>
-	int MaxCount { get; 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>
     /// Добавление объекта в коллекцию на конкретную позицию
@@ -30,7 +32,7 @@ public interface ICollectionGenericObjects<T>
     /// <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>
     /// Удаление объекта из коллекции с конкретной позиции
@@ -56,4 +58,10 @@ public interface ICollectionGenericObjects<T>
     /// </summary>
     /// <returns>Поэлементый вывод элементов коллекции</returns>
     IEnumerable<T?> GetItems();
+
+    /// <summary>
+	/// Сортировка коллекции
+	/// </summary>
+	/// <param name="comparer">Сравнитель объектов</param>
+	void CollectionSort(IComparer<T?> comparer);
 }

AirFighter/AirFighter/CollectionGenericObjects/ListGenericObjects.cs

@@ -1,5 +1,4 @@
 using ProjectAirFighter.Exceptions;
-using ProjectSportCar.Exceptions;
 
 namespace ProjectAirFighter.CollectionGenericObjects;
 
@@ -24,7 +23,10 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
 
     public int MaxCount
     {
-        get => _maxCount;
+        get
+        {
+            return Count;
+        }
         set
         {
             if (value > 0)
@@ -50,34 +52,41 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
         return _collection[position];
     }
 
-    public int Insert(T obj)
+    public int Insert(T obj, IEqualityComparer<T?>? comparer = null)
     {
         if (Count == _maxCount) throw new CollectionOverflowException(Count);
         _collection.Add(obj);
         return Count;
+        //TODO
     }
 
-    public int Insert(T obj, int position)
+    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);
         _collection.Insert(position, obj);
         return position;
+        //TODO
     }
 
     public T? Remove(int position)
     {
-        if (position < 0 || position > Count) throw new PositionOutOfCollectionException(position);
-        T? pos = _collection[position];
+        if (position >= _collection.Count || position < 0) throw new PositionOutOfCollectionException(position);
+        T obj = _collection[position];
         _collection.RemoveAt(position);
-        return pos;
+        return obj;
     }
 
     public IEnumerable<T?> GetItems()
     {
-        for (int i = 0; i < _collection.Count; ++i)
+        for (int i = 0; i < Count; ++i)
         {
             yield return _collection[i];
         }
     }
+
+    public void CollectionSort(IComparer<T?> comparer)
+    {
+        _collection.Sort(comparer);
+    }
 }

AirFighter/AirFighter/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -1,5 +1,5 @@
-using ProjectAirFighter.Exceptions;
-using ProjectSportCar.Exceptions;
+using AirFighter;
+using ProjectAirFighter.Exceptions;
 
 namespace ProjectAirFighter.CollectionGenericObjects;
 
@@ -51,61 +51,90 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
 
     public T? Get(int position)
     {
-        if (position >= _collection.Length || position < 0) throw new PositionOutOfCollectionException(position);
+        if (position < 0 || position >= Count - 3) 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++;
+        for (int i = 0; i < Count - 3; 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 >= _collection.Length || position < 0) throw new PositionOutOfCollectionException(position);
+        if (position < 0 || position >= Count - 3) throw new PositionOutOfCollectionException(position);
 
-        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);
             }
         }
-        throw new CollectionOverflowException(Count);
+
+        // вставка
+        _collection[position] = obj;
+        return position;
     }
 
     public T? Remove(int position)
     {
-        if (position >= _collection.Length || position < 0) throw new PositionOutOfCollectionException(position);
+        if (position >= Count - 3 || position < 0) throw new PositionOutOfCollectionException(position);
         if (_collection[position] == null) throw new ObjectNotFoundException(position);
         T obj = _collection[position];
         _collection[position] = null;
@@ -119,4 +148,9 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
             yield return _collection[i];
         }
     }
+
+    public void CollectionSort(IComparer<T?> comparer)
+    {
+        Array.Sort(_collection, comparer);
+    }
 }

AirFighter/AirFighter/CollectionGenericObjects/StorageCollection.cs

@@ -1,5 +1,8 @@
-using ProjectAirFighter.Drawnings;
+using AirFighter;
+using Microsoft.AspNetCore.Http;
+using ProjectAirFighter.Drawnings;
 using ProjectAirFighter.Exceptions;
+using System.Collections.Generic;
 using System.Text;
 
 namespace ProjectAirFighter.CollectionGenericObjects;
@@ -10,7 +13,6 @@ namespace ProjectAirFighter.CollectionGenericObjects;
 /// <typeparam name="T"></typeparam>
 public class StorageCollection<T>
     where T : DrawningMilitaryAircraft
-
 {
     /// <summary>
     /// Словарь (хранилище) с коллекциями
@@ -47,16 +49,15 @@ public class StorageCollection<T>
     /// <summary>
     /// Добавление коллекции в хранилище
     /// </summary>
-    /// <param name="name">Название коллекции</param>
-    /// <param name="collectionType">тип коллекции</param>
-    public void AddCollection(string name, CollectionType collectionType)
+    /// <param name="collectionInfo">тип коллекции</param>
+    public void AddCollection(CollectionInfo collectionInfo)
     {
-        if (name == null || _storages.ContainsKey(name)) { return; }
+        if (_storages.ContainsKey(collectionInfo)) throw new CollectionAlreadyExistsException(collectionInfo);
         switch (collectionType)
 
         {
             case CollectionType.None:
-                return;
+                throw new CollectionTypeException("Пустой тип коллекции");
             case CollectionType.Massive:
                 _storages[name] = new MassiveGenericObjects<T>();
                 return;
@@ -70,10 +71,10 @@ public class StorageCollection<T>
     /// Удаление коллекции
     /// </summary>
     /// <param name="name">Название коллекции</param>
-    public void DelCollection(string name)
+    public void DelCollection(CollectionInfo collectionInfo)
     {
-        if (_storages.ContainsKey(name))
-            _storages.Remove(name);
+        if (_storages.ContainsKey(collectionInfo))
+            _storages.Remove(collectionInfo);
     }
 
     /// <summary>
@@ -81,24 +82,27 @@ public class StorageCollection<T>
     /// </summary>
     /// <param name="name">Название коллекции</param>
     /// <returns></returns>
-    public ICollectionGenericObjects<T>? this[string name]
+    public ICollectionGenericObjects<T>? this[CollectionInfo collectionInfo]
     {
         get
         {
-            if (name == null || !_storages.ContainsKey(name)) { return null; }
-            return _storages[name];
+            if(_storages.ContainsKey(collectionInfo))
+                return _storages[collectionInfo];
+            return null;
         }
     }
 
     /// <summary>
-	/// Сохранение информации по автомобилям в хранилище в файл
-	/// </summary>
-	/// <param name="filename">Путь и имя файла</param>
-	public void SaveData(string filename)
+    /// Сохранение информации по военным самолётам в хранилище в файл
+    /// </summary>
+    /// <param name="filename">Путь и имя файла</param>
+    /// <returns>true - сохранение прошло успешно, false - ошибка при сохранении данных</returns>
+
+    public void SaveData(string filename)
     {
         if (_storages.Count == 0)
         {
-            throw new Exception("В хранилище отсутствуют коллекции для сохранения");
+            throw new InvalidOperationException("В хранилище отсутствуют коллекции для сохранения");
         }
 
         if (File.Exists(filename))
@@ -109,12 +113,13 @@ public class StorageCollection<T>
         using (StreamWriter writer = new StreamWriter(filename))
         {
             writer.Write(_collectionKey);
+
             foreach (KeyValuePair<string, ICollectionGenericObjects<T>> value in _storages)
             {
                 StringBuilder sb = new();
 
                 sb.Append(Environment.NewLine);
-                // не сохраняем пустые коллекции
+
                 if (value.Value.Count == 0)
                 {
                     continue;
@@ -122,13 +127,13 @@ public class StorageCollection<T>
 
                 sb.Append(value.Key);
                 sb.Append(_separatorForKeyValue);
-                sb.Append(value.Value.GetCollectionType);
-                sb.Append(_separatorForKeyValue);
                 sb.Append(value.Value.MaxCount);
                 sb.Append(_separatorForKeyValue);
+
                 foreach (T? item in value.Value.GetItems())
                 {
                     string data = item?.GetDataForSave() ?? string.Empty;
+
                     if (string.IsNullOrEmpty(data))
                     {
                         continue;
@@ -142,56 +147,51 @@ public class StorageCollection<T>
     }
 
     /// <summary>
-    /// Загрузка информации по автомобилям в хранилище из файла
+    /// Загрузка информации по военным самолётам в хранилище из файла
     /// </summary>
     /// <param name="filename">Путь и имя файла</param>
     /// <returns>true - загрузка прошла успешно, false - ошибка при загрузке данных</returns>
-
-    //
     public void LoadData(string filename)
     {
         if (!File.Exists(filename))
         {
-            throw new Exception("Файл не существует");
+            throw new FileNotFoundException(filename);
         }
         using (StreamReader fs = File.OpenText(filename))
-        {   
+        {
             string str = fs.ReadLine();
 
             if (str == null || str.Length == 0)
             {
-                throw new Exception("В файле нет данных");
+                throw new FormatException("В файле неверные данные");
             }
 
             if (!str.StartsWith(_collectionKey))
             {
-                throw new Exception("В файле неверные данные");
+                throw new FormatException(filename);
             }
 
             _storages.Clear();
-            
+
             string strs = "";
 
             while ((strs = fs.ReadLine()) != null)
             {
                 string[] record = strs.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
 
-                if (record.Length != 4)
+                if (record.Length != 3)
                 {
                     continue;
                 }
 
-                CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]);
-                ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionType);
+                CollectionInfo? collectionInfo = CollectionInfo.GetCollectionInfo(record[0]) ??
+                throw new Exception("Не удалось определить информацию коллекции:" + record[0]);
 
-                if (collection == null)
-                {
-                    throw new Exception("Не удалось создать коллекцию");
-                }
+                ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionInfo.CollectionType) ??
+                    throw new Exception("Не удалось определить тип коллекции:" + record[1]);
+                collection.MaxCount = Convert.ToInt32(record[1]);
 
-                collection.MaxCount = Convert.ToInt32(record[2]);
-
-                string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
+                string[] set = record[2].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
 
                 foreach (string elem in set)
                 {
@@ -199,18 +199,15 @@ public class StorageCollection<T>
                     {
                         try
                         {
-                            if (collection.Insert(militaryAircraft) == -1)
-                            {
-                                throw new Exception("Объект не удалось добавить в коллекцию: " + record[3]);
-                            }
+                            collection.Insert(militaryAircraft);
                         }
-                        catch (CollectionOverflowException ex)
+                        catch (Exception ex)
                         {
-                            throw new Exception("Коллекция переполнена", ex);
+                            throw new FileFormatException(filename, ex);
                         }
                     }
                 }
-                _storages.Add(record[0], collection);
+                _storages.Add(collectionInfo, collection);
             }
         }
     }

AirFighter/AirFighter/Drawnings/DrawiningMilitaryAircraftEqutables.cs

@@ -0,0 +1,65 @@
+using ProjectAirFighter.Entities;
+using System.Diagnostics.CodeAnalysis;
+
+namespace ProjectAirFighter.Drawnings;
+
+/// <summary>
+/// Реализация сравнения двух объектов класса-прорисовки
+/// </summary>
+public class DrawiningCarEqutables : IEqualityComparer<DrawningMilitaryAircraft?>
+{
+    public bool Equals(DrawningMilitaryAircraft? x, DrawningMilitaryAircraft? y)
+    {
+        if (x == null || x.EntityMilitaryAircraft == null)
+        {
+            return false;
+        }
+
+        if (y == null || y.EntityMilitaryAircraft == null)
+        {
+            return false;
+        }
+
+        if (x.GetType().Name != y.GetType().Name)
+        {
+            return false;
+        }
+
+        if (x.EntityMilitaryAircraft.Speed != y.EntityMilitaryAircraft.Speed)
+        {
+            return false;
+        }
+
+        if (x.EntityMilitaryAircraft.Weight != y.EntityMilitaryAircraft.Weight)
+        {
+            return false;
+        }
+
+        if (x.EntityMilitaryAircraft.BodyColor != y.EntityMilitaryAircraft.BodyColor)
+        {
+            return false;
+        }
+
+        if (x is DrawningAirFighter && y is DrawningAirFighter)
+        {
+            EntityAirFighter xAirFighter = (EntityAirFighter)x.EntityMilitaryAircraft;
+            EntityAirFighter yAirFighter = (EntityAirFighter)y.EntityMilitaryAircraft;
+
+            if (xAirFighter.AdditionalColor != yAirFighter.AdditionalColor)
+                return false;
+
+            if (xAirFighter.Wings != yAirFighter.Wings)
+                return false;
+
+            if (xAirFighter.Rockets != yAirFighter.Rockets)
+                return false;
+        }
+
+        return true;
+    }
+
+    public int GetHashCode([DisallowNull] DrawningMilitaryAircraft obj)
+    {
+        return obj.GetHashCode();
+    }
+}

AirFighter/AirFighter/Drawnings/DrawningAirFighter.cs

@@ -25,14 +25,19 @@ public class DrawningAirFighter : DrawningMilitaryAircraft
     /// <summary>
     /// Конструктор
     /// </summary>
-    public DrawningAirFighter(EntityMilitaryAircraft entityMilitaryAircraft) : base(110, 60)
+    public DrawningAirFighter(EntityAirFighter militaryAircraft) : base(110, 60)
     {
-        if (entityMilitaryAircraft != null)
-        {
-            EntityMilitaryAircraft = entityMilitaryAircraft;
-        }
+        EntityMilitaryAircraft = new EntityAirFighter(militaryAircraft.Speed, militaryAircraft.Weight, militaryAircraft.BodyColor, militaryAircraft.AdditionalColor, militaryAircraft.Wings, militaryAircraft.Rockets);
     }
 
+    //public DrawningAirFighter(EntityMilitaryAircraft entityMilitaryAircraft) : base(110, 60)
+    //{
+    //    if (entityMilitaryAircraft != null)
+    //    {
+    //        EntityMilitaryAircraft = entityMilitaryAircraft;
+    //    }
+    //}
+
     public override void DrawTransport(Graphics g)
     {
         if (EntityMilitaryAircraft == null || EntityMilitaryAircraft is not EntityAirFighter airFighter || !_startPosX.HasValue || !_startPosY.HasValue)

AirFighter/AirFighter/Drawnings/DrawningMilitaryAircraft.cs

@@ -85,10 +85,10 @@ public class DrawningMilitaryAircraft
     }
 
     /// <summary>
-	/// Конструктор
-	/// </summary>
-	/// <param name="militaryAircraft">Класс-сущность</param>
-	public DrawningMilitaryAircraft(EntityMilitaryAircraft militaryAircraft) : this()
+    /// Конструктор
+    /// </summary>
+    /// <param name="militaryAircraft">Класс-сущность</param>
+    public DrawningMilitaryAircraft(EntityMilitaryAircraft militaryAircraft) : this()
     {
         EntityMilitaryAircraft = militaryAircraft;
     }

AirFighter/AirFighter/Drawnings/DrawningMilitaryAircraftCarCompareByType.cs

@@ -0,0 +1,33 @@
+namespace ProjectAirFighter.Drawnings;
+
+/// <summary>
+/// Сравнение по типу, скорости, весу
+/// </summary>
+public class DrawningMilitaryAircraftCompareByType : IComparer<DrawningMilitaryAircraft?>
+{
+    public int Compare(DrawningMilitaryAircraft? x, DrawningMilitaryAircraft? y)
+    {
+        if (x == null || x.EntityMilitaryAircraft == null)
+        {
+            return -1;
+        }
+
+        if (y == null || y.EntityMilitaryAircraft == null)
+        {
+            return 1;
+        }
+
+        if (x.GetType().Name != y.GetType().Name)
+        {
+            return x.GetType().Name.CompareTo(y.GetType().Name);
+        }
+
+        var speedCompare = x.EntityMilitaryAircraft.Speed.CompareTo(y.EntityMilitaryAircraft.Speed);
+        if (speedCompare != 0)
+        {
+            return speedCompare;
+        }
+
+        return x.EntityMilitaryAircraft.Weight.CompareTo(y.EntityMilitaryAircraft.Weight);
+    }
+}

AirFighter/AirFighter/Drawnings/DrawningMilitaryAircraftCompareByColor.cs

@@ -0,0 +1,27 @@
+namespace ProjectAirFighter.Drawnings;
+internal class DrawningMilitaryAircraftCompareByColor : IComparer<DrawningMilitaryAircraft?>
+{
+    public int Compare(DrawningMilitaryAircraft? x, DrawningMilitaryAircraft? y)
+    {
+        if (x == null || x.EntityMilitaryAircraft == null)
+        {
+            return 1;
+        }
+
+        if (y == null || y.EntityMilitaryAircraft == null)
+        {
+            return -1;
+        }
+        var bodycolorCompare = x.EntityMilitaryAircraft.BodyColor.Name.CompareTo(y.EntityMilitaryAircraft.BodyColor.Name);
+        if (bodycolorCompare != 0)
+        {
+            return bodycolorCompare;
+        }
+        var speedCompare = x.EntityMilitaryAircraft.Speed.CompareTo(y.EntityMilitaryAircraft.Speed);
+        if (speedCompare != 0)
+        {
+            return speedCompare;
+        }
+        return x.EntityMilitaryAircraft.Weight.CompareTo(y.EntityMilitaryAircraft.Weight);
+    }
+}

AirFighter/AirFighter/Drawnings/ExtentionDrawningMilitaryAircraft.cs

@@ -23,7 +23,7 @@ public static class ExtentionDrawningMilitaryAircraft
         EntityMilitaryAircraft? militaryAircraft = EntityAirFighter.CreateEntityAirFighter(strs);
         if (militaryAircraft != null)
         {
-            return new DrawningAirFighter(militaryAircraft);
+            return new DrawningAirFighter((EntityAirFighter)militaryAircraft);
         }
 
         militaryAircraft = EntityMilitaryAircraft.CreateEntityMilitaryAircraft(strs);

AirFighter/AirFighter/Exceptions/CollectionAlreadyExistsException.cs

@@ -0,0 +1,14 @@
+using System.Runtime.Serialization;
+
+namespace AirFighter;
+
+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) { }
+}

AirFighter/AirFighter/Exceptions/CollectionInfoException.cs

@@ -0,0 +1,14 @@
+using System.Runtime.Serialization;
+
+namespace AirFighter;
+
+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) { }
+}

AirFighter/AirFighter/Exceptions/CollectionInsertException.cs

@@ -0,0 +1,14 @@
+using System.Runtime.Serialization;
+namespace AirFighter;
+
+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) { }
+}

AirFighter/AirFighter/Exceptions/CollectionOverflowException.cs

@@ -6,7 +6,7 @@ namespace ProjectAirFighter.Exceptions;
 /// Класс, описывающий ошибку переполнения коллекции
 /// </summary>
 [Serializable]
-internal class CollectionOverflowException : ApplicationException
+public class CollectionOverflowException : ApplicationException
 {
     public CollectionOverflowException(int count) : base("В коллекции превышено допустимое количество: " + count) { }
 

AirFighter/AirFighter/Exceptions/CollectionTypeException.cs

@@ -0,0 +1,14 @@
+using System.Runtime.Serialization;
+
+namespace AirFighter;
+
+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) { }
+}

AirFighter/AirFighter/Exceptions/DrawningEquitablesException.cs

@@ -0,0 +1,14 @@
+using System.Runtime.Serialization;
+
+namespace AirFighter;
+
+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) { }
+}

AirFighter/AirFighter/Exceptions/EmptyFileExeption.cs

@@ -0,0 +1,15 @@
+using System.Runtime.Serialization;
+
+namespace AirFighter;
+
+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) { }
+}

AirFighter/AirFighter/Exceptions/FileFormatException.cs

@@ -0,0 +1,14 @@
+using System.Runtime.Serialization;
+
+namespace AirFighter;
+
+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) { }
+}

AirFighter/AirFighter/Exceptions/FileNotFoundException.cs

@@ -0,0 +1,15 @@
+using System.Runtime.Serialization;
+
+namespace AirFighter;
+
+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) { }
+}

AirFighter/AirFighter/Exceptions/PositionOutOfCollectionException.cs

@@ -1,6 +1,6 @@
 using System.Runtime.Serialization;
 
-namespace ProjectSportCar.Exceptions;
+namespace ProjectAirFighter.Exceptions;
 
 /// <summary>
 /// Класс, описывающий ошибку выхода за границы коллекции

AirFighter/AirFighter/FormMilitaryAircraftCollection.Designer.cs

@@ -50,8 +50,10 @@
             файлToolStripMenuItem = new ToolStripMenuItem();
             saveToolStripMenuItem = new ToolStripMenuItem();
             loadToolStripMenuItem = new ToolStripMenuItem();
-            openFileDialog = new OpenFileDialog();
             saveFileDialog = new SaveFileDialog();
+            openFileDialog = new OpenFileDialog();
+            buttonSortByColor = new Button();
+            buttonSortByType = new Button();
             groupBoxTools.SuspendLayout();
             panelCompanyTools.SuspendLayout();
             panelStorage.SuspendLayout();
@@ -68,13 +70,15 @@
             groupBoxTools.Dock = DockStyle.Right;
             groupBoxTools.Location = new Point(744, 28);
             groupBoxTools.Name = "groupBoxTools";
-            groupBoxTools.Size = new Size(206, 639);
+            groupBoxTools.Size = new Size(206, 711);
             groupBoxTools.TabIndex = 0;
             groupBoxTools.TabStop = false;
             groupBoxTools.Text = "Инструменты";
             // 
             // panelCompanyTools
             // 
+            panelCompanyTools.Controls.Add(buttonSortByColor);
+            panelCompanyTools.Controls.Add(buttonSortByType);
             panelCompanyTools.Controls.Add(buttonRefresh);
             panelCompanyTools.Controls.Add(buttonGoToCheck);
             panelCompanyTools.Controls.Add(buttonRemoveMilitaryAircraft);
@@ -82,15 +86,15 @@
             panelCompanyTools.Controls.Add(maskedTextBoxPosition);
             panelCompanyTools.Dock = DockStyle.Bottom;
             panelCompanyTools.Enabled = false;
-            panelCompanyTools.Location = new Point(3, 350);
+            panelCompanyTools.Location = new Point(3, 360);
             panelCompanyTools.Name = "panelCompanyTools";
-            panelCompanyTools.Size = new Size(200, 286);
+            panelCompanyTools.Size = new Size(200, 348);
             panelCompanyTools.TabIndex = 10;
             // 
             // buttonRefresh
             // 
             buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRefresh.Location = new Point(4, 234);
+            buttonRefresh.Location = new Point(8, 195);
             buttonRefresh.Name = "buttonRefresh";
             buttonRefresh.Size = new Size(192, 49);
             buttonRefresh.TabIndex = 7;
@@ -101,7 +105,7 @@
             // buttonGoToCheck
             // 
             buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonGoToCheck.Location = new Point(3, 181);
+            buttonGoToCheck.Location = new Point(3, 140);
             buttonGoToCheck.Name = "buttonGoToCheck";
             buttonGoToCheck.Size = new Size(192, 49);
             buttonGoToCheck.TabIndex = 6;
@@ -112,7 +116,7 @@
             // buttonRemoveMilitaryAircraft
             // 
             buttonRemoveMilitaryAircraft.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRemoveMilitaryAircraft.Location = new Point(4, 113);
+            buttonRemoveMilitaryAircraft.Location = new Point(4, 91);
             buttonRemoveMilitaryAircraft.Name = "buttonRemoveMilitaryAircraft";
             buttonRemoveMilitaryAircraft.Size = new Size(191, 49);
             buttonRemoveMilitaryAircraft.TabIndex = 5;
@@ -123,7 +127,7 @@
             // buttonAddMilitaryAircraft
             // 
             buttonAddMilitaryAircraft.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonAddMilitaryAircraft.Location = new Point(4, 25);
+            buttonAddMilitaryAircraft.Location = new Point(4, 3);
             buttonAddMilitaryAircraft.Name = "buttonAddMilitaryAircraft";
             buttonAddMilitaryAircraft.Size = new Size(191, 49);
             buttonAddMilitaryAircraft.TabIndex = 1;
@@ -134,7 +138,7 @@
             // maskedTextBoxPosition
             // 
             maskedTextBoxPosition.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            maskedTextBoxPosition.Location = new Point(3, 80);
+            maskedTextBoxPosition.Location = new Point(3, 58);
             maskedTextBoxPosition.Mask = "00";
             maskedTextBoxPosition.Name = "maskedTextBoxPosition";
             maskedTextBoxPosition.Size = new Size(192, 27);
@@ -143,9 +147,9 @@
             // 
             // buttonCreateCompany
             // 
-            buttonCreateCompany.Location = new Point(6, 315);
+            buttonCreateCompany.Location = new Point(7, 322);
             buttonCreateCompany.Name = "buttonCreateCompany";
-            buttonCreateCompany.Size = new Size(192, 29);
+            buttonCreateCompany.Size = new Size(191, 29);
             buttonCreateCompany.TabIndex = 9;
             buttonCreateCompany.Text = "Создание компании";
             buttonCreateCompany.UseVisualStyleBackColor = true;
@@ -163,12 +167,12 @@
             panelStorage.Dock = DockStyle.Top;
             panelStorage.Location = new Point(3, 23);
             panelStorage.Name = "panelStorage";
-            panelStorage.Size = new Size(200, 252);
+            panelStorage.Size = new Size(200, 256);
             panelStorage.TabIndex = 8;
             // 
             // buttonCollectionDel
             // 
-            buttonCollectionDel.Location = new Point(6, 220);
+            buttonCollectionDel.Location = new Point(6, 224);
             buttonCollectionDel.Name = "buttonCollectionDel";
             buttonCollectionDel.Size = new Size(189, 29);
             buttonCollectionDel.TabIndex = 6;
@@ -239,7 +243,7 @@
             comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
             comboBoxSelectorCompany.FormattingEnabled = true;
             comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
-            comboBoxSelectorCompany.Location = new Point(6, 281);
+            comboBoxSelectorCompany.Location = new Point(7, 285);
             comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
             comboBoxSelectorCompany.Size = new Size(193, 28);
             comboBoxSelectorCompany.TabIndex = 0;
@@ -250,7 +254,7 @@
             pictureBox.Dock = DockStyle.Fill;
             pictureBox.Location = new Point(0, 28);
             pictureBox.Name = "pictureBox";
-            pictureBox.Size = new Size(744, 639);
+            pictureBox.Size = new Size(744, 711);
             pictureBox.TabIndex = 3;
             pictureBox.TabStop = false;
             // 
@@ -262,7 +266,7 @@
             menuStrip.Name = "menuStrip";
             menuStrip.Size = new Size(950, 28);
             menuStrip.TabIndex = 4;
-            menuStrip.Text = "menuStrip1";
+            menuStrip.Text = "menuStrip";
             // 
             // файлToolStripMenuItem
             // 
@@ -287,20 +291,41 @@
             loadToolStripMenuItem.Text = "Загрузка";
             loadToolStripMenuItem.Click += loadToolStripMenuItem_Click;
             // 
-            // openFileDialog
-            // 
-            openFileDialog.FileName = "openFileDialog1";
-            openFileDialog.Filter = "txt file | *.txt";
-            // 
             // saveFileDialog
             // 
             saveFileDialog.Filter = "txt file | *.txt";
             // 
+            // openFileDialog
+            // 
+            openFileDialog.Filter = "txt file | *.txt";
+            // 
+            // buttonSortByColor
+            // 
+            buttonSortByColor.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonSortByColor.Location = new Point(4, 296);
+            buttonSortByColor.Name = "buttonSortByColor";
+            buttonSortByColor.Size = new Size(192, 49);
+            buttonSortByColor.TabIndex = 9;
+            buttonSortByColor.Text = "Сортировка по цвету";
+            buttonSortByColor.UseVisualStyleBackColor = true;
+            buttonSortByColor.Click += buttonSortByColor_Click;
+            // 
+            // buttonSortByType
+            // 
+            buttonSortByType.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonSortByType.Location = new Point(6, 250);
+            buttonSortByType.Name = "buttonSortByType";
+            buttonSortByType.Size = new Size(191, 49);
+            buttonSortByType.TabIndex = 8;
+            buttonSortByType.Text = "Сортировка по типу";
+            buttonSortByType.UseVisualStyleBackColor = true;
+            buttonSortByType.Click += buttonSortByType_Click;
+            // 
             // FormMilitaryAircraftCollection
             // 
             AutoScaleDimensions = new SizeF(8F, 20F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(950, 667);
+            ClientSize = new Size(950, 739);
             Controls.Add(pictureBox);
             Controls.Add(groupBoxTools);
             Controls.Add(menuStrip);
@@ -343,7 +368,9 @@
         private ToolStripMenuItem файлToolStripMenuItem;
         private ToolStripMenuItem saveToolStripMenuItem;
         private ToolStripMenuItem loadToolStripMenuItem;
-        private OpenFileDialog openFileDialog;
         private SaveFileDialog saveFileDialog;
+        private OpenFileDialog openFileDialog;
+        private Button buttonSortByColor;
+        private Button buttonSortByType;
     }
 }

AirFighter/AirFighter/FormMilitaryAircraftCollection.cs

@@ -2,7 +2,6 @@
 using ProjectAirFighter.CollectionGenericObjects;
 using ProjectAirFighter.Drawnings;
 using ProjectAirFighter.Exceptions;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement.TrackBar;
 
 namespace ProjectAirFighter;
 
@@ -19,9 +18,10 @@ public partial class FormMilitaryAircraftCollection : Form
     private AbstractCompany? _company = null;
 
     /// <summary>
-    /// Логгер
+    /// Логер
     /// </summary>
     private readonly ILogger _logger;
+
     /// <summary>
 	/// Конструктор
 	/// </summary>
@@ -30,7 +30,6 @@ public partial class FormMilitaryAircraftCollection : Form
         InitializeComponent();
         _storageCollection = new();
         _logger = logger;
-        _logger.LogInformation("Форма загрузилась");
     }
 
     /// <summary>
@@ -62,25 +61,23 @@ public partial class FormMilitaryAircraftCollection : Form
     /// <param name="militaryAircraft"></param>
     private void SetMilitaryAircraft(DrawningMilitaryAircraft? militaryAircraft)
     {
-        try 
-        { 
-            if (_company == null || militaryAircraft == null)
-            {
-                return;
-            }
-
-            if (_company + militaryAircraft != -1)
-            {
-                MessageBox.Show("Объект добавлен");
-                pictureBox.Image = _company.Show();
-                _logger.LogInformation("Добавлен объект: " + militaryAircraft.GetDataForSave());
-            }
-        }
-        catch (ObjectNotFoundException) { }
-        catch (CollectionOverflowException ex)
+        if (_company == null || militaryAircraft == null)
         {
-            MessageBox.Show("Не удалось добавить объект");
-            _logger.LogError("Ошибка: {Message}", ex.Message);
+            return;
+        }
+
+        try
+        {
+            var res = _company + militaryAircraft;
+            MessageBox.Show("Объект добавлен");
+            _logger.LogInformation($"Объект добавлен под индексом {res}");
+            pictureBox.Image = _company.Show();
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show($"Объект не добавлен: {ex.Message}", "Результат", MessageBoxButtons.OK,
+                MessageBoxIcon.Error);
+            _logger.LogError($"Ошибка: {ex.Message}", ex.Message);
         }
     }
 
@@ -105,17 +102,16 @@ public partial class FormMilitaryAircraftCollection : Form
         int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
         try
         {
-            if (_company - pos != null)
-            {
-                MessageBox.Show("Объект удален");
-                pictureBox.Image = _company.Show();
-                _logger.LogInformation("Удален объект по позиции " + pos);
-            }
+            var res = _company - pos;
+            MessageBox.Show("Объект удален");
+            _logger.LogInformation($"Объект удален под индексом {pos}");
+            pictureBox.Image = _company.Show();
         }
         catch (Exception ex)
         {
-            MessageBox.Show("Не удалось удалить объект");
-            _logger.LogError("Ошибка: {Message}", ex.Message);
+            MessageBox.Show(ex.Message, "Не удалось удалить объект",
+                MessageBoxButtons.OK, MessageBoxIcon.Error);
+            _logger.LogError($"Ошибка: {ex.Message}", ex.Message);
         }
     }
 
@@ -133,28 +129,26 @@ public partial class FormMilitaryAircraftCollection : Form
 
         DrawningMilitaryAircraft? militaryAircraft = null;
         int counter = 100;
-        try
+        while (militaryAircraft == null)
         {
-            while (militaryAircraft == null)
+            militaryAircraft = _company.GetRandomObject();
+            counter--;
+            if (counter <= 0)
             {
-                militaryAircraft = _company.GetRandomObject();
-                counter--;
-                if (counter <= 0)
-                {
-                    break;
-                }
+                break;
             }
-            FormAirFighter Form = new()
-            {
-                SetAir = militaryAircraft
-            };
-            Form.ShowDialog();
         }
-        catch (Exception ex)
 
+        if (militaryAircraft == null)
         {
-            MessageBox.Show(ex.Message, "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            return;
         }
+
+        FormAirFighter form = new()
+        {
+            SetAir = militaryAircraft
+        };
+        form.ShowDialog();
     }
 
     /// <summary>
@@ -180,50 +174,43 @@ public partial class FormMilitaryAircraftCollection : Form
             return;
         }
 
+        CollectionType collectionType = CollectionType.None;
+        if (radioButtonMassive.Checked)
+        {
+            collectionType = CollectionType.Massive;
+        }
+        else if (radioButtonList.Checked)
+        {
+            collectionType = CollectionType.List;
+        }
+
         try
         {
-            CollectionType collectionType = CollectionType.None;
-            if (radioButtonMassive.Checked)
-            {
-                collectionType = CollectionType.Massive;
-            }
-            else if (radioButtonList.Checked)
-            {
-                collectionType = CollectionType.List;
-            }
             _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
+            _logger.LogInformation("Добавление коллекции");
             RerfreshListBoxItems();
-            _logger.LogInformation("Коллекция добавлена " + textBoxCollectionName.Text);
         }
         catch (Exception ex)
         {
-            _logger.LogError("Ошибка: {Message}", ex.Message);
+            MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            _logger.LogError($"Ошибка: {ex.Message}", ex.Message);
         }
-        RerfreshListBoxItems();
     }
 
     private void buttonCollectionDel_Click(object sender, EventArgs e)
     {
-        if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
+        if (listBoxCollection.SelectedItem == null)
         {
             MessageBox.Show("Коллекция не выбрана");
             return;
         }
-
-        try
+        if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
         {
-            if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
-            {
-                return;
-            }
-            _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
-            RerfreshListBoxItems();
-            _logger.LogInformation("Коллекция: " + listBoxCollection.SelectedItem.ToString() + " удалена");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError("Ошибка: {Message}", ex.Message);
+            return;
         }
+        _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
+        _logger.LogInformation("Коллекция удалена");
+        RerfreshListBoxItems();
     }
 
     private void RerfreshListBoxItems()
@@ -259,6 +246,7 @@ public partial class FormMilitaryAircraftCollection : Form
         {
             case "Хранилище":
                 _company = new Angar(pictureBox.Width, pictureBox.Height, collection);
+                _logger.LogInformation("Компания создана");
                 break;
         }
 
@@ -266,11 +254,6 @@ public partial class FormMilitaryAircraftCollection : Form
         RerfreshListBoxItems();
     }
 
-    /// <summary>
-    /// Обработка нажатия "Сохранение"
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
     private void saveToolStripMenuItem_Click(object sender, EventArgs e)
     {
         if (saveFileDialog.ShowDialog() == DialogResult.OK)
@@ -283,17 +266,12 @@ public partial class FormMilitaryAircraftCollection : Form
             }
             catch (Exception ex)
             {
-                MessageBox.Show(ex.Message, "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                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)
@@ -301,16 +279,50 @@ public partial class FormMilitaryAircraftCollection : Form
             try
             {
                 _storageCollection.LoadData(openFileDialog.FileName);
-                MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
                 RerfreshListBoxItems();
+                MessageBox.Show("Загрузка прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
                 _logger.LogInformation("Загрузка из файла: {filename}", openFileDialog.FileName);
             }
             catch (Exception ex)
             {
-
-                MessageBox.Show("Не сохранилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                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)
+    {
+        CompareCars(new DrawningMilitaryAircraftCompareByType());
+    }
+
+    /// <summary>
+	/// Сортировка по цвету
+	/// </summary>
+	/// <param name="sender"></param>
+	/// <param name="e"></param>
+    private void buttonSortByColor_Click(object sender, EventArgs e)
+    {
+        CompareCars(new DrawningMilitaryAircraftCompareByType());
+    }
+
+    /// <summary>
+	/// Сортировка по сравнителю
+	/// </summary>
+	/// <param name="comparer">Сравнитель объектов</param>
+	private void CompareCars(IComparer<DrawningMilitaryAircraft?> comparer)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+
+        _company.Sort(comparer);
+        pictureBox.Image = _company.Show();
+    }
 }

AirFighter/AirFighter/FormMilitaryAircraftCollection.resx

@@ -120,10 +120,13 @@
   <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>145, 17</value>
   </metadata>
-  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>315, 17</value>
+  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>310, 17</value>
+  </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>71</value>
   </metadata>
 </root>

AirFighter/AirFighter/MilitaryAircraftDelegate.cs

@@ -1,9 +0,0 @@
-using ProjectAirFighter.Drawnings;
-
-namespace ProjectAirFighter;
-
-/// <summary>
-/// Делегат передачи объекта класса-прорисовки
-/// </summary>
-/// <param name="militaryAircraft"></param>
-public delegate void MilitaryAircraftDelegate(DrawningMilitaryAircraft militaryAircraft);

AirFighter/AirFighter/Program.cs

@@ -1,40 +1,50 @@
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using Serilog;
 
-using NLog.Extensions.Logging;
+namespace ProjectAirFighter;
 
-namespace ProjectAirFighter
+internal static class Program
 {
-    internal static class Program
+    /// <summary>
+    ///  The main entry point for the application.
+    /// </summary>
+    [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();
+        // To customize application configuration such as set high DPI settings or default font,
+        // see https://aka.ms/applicationconfiguration.
+        ApplicationConfiguration.Initialize();
 
-            ServiceCollection services = new();
-            ConfigureServices(services);
-            using ServiceProvider serviceProvider = services.BuildServiceProvider();
-            Application.Run(serviceProvider.GetRequiredService<FormMilitaryAircraftCollection>());
-        }
+        var services = new ServiceCollection();
+        ConfigureServices(services);
+        using ServiceProvider serviceProvider = services.BuildServiceProvider();
+        Application.Run(serviceProvider.GetRequiredService <FormMilitaryAircraftCollection>());
+        
+    }
 
-        /// <summary>
-		/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> DI
-		/// </summary>
-		/// <param name="services"></param>
-		private static void ConfigureServices(ServiceCollection services)
+    /// <summary>
+    /// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> DI
+	/// </summary>
+	/// <param name="services"></param>
+	private static void ConfigureServices(ServiceCollection services)
+    {
+        services.AddSingleton<FormMilitaryAircraftCollection>().AddLogging(option =>
         {
-            services.AddSingleton<FormMilitaryAircraftCollection>()
-                    .AddLogging(option =>
-                    {
-                        option.SetMinimumLevel(LogLevel.Information);
-                        option.AddNLog("nlog.config");
-                    });
-        }
+            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);
+        });
     }
 }

AirFighter/AirFighter/ProjectAirFighter.csproj

@@ -9,8 +9,13 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.10" />
+    <PackageReference Include="Serilog" Version="3.1.1" />
+    <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
+    <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
   </ItemGroup>
 
   <ItemGroup>
@@ -28,10 +33,4 @@
     </EmbeddedResource>
   </ItemGroup>
 
-  <ItemGroup>
-    <None Update="nlog.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
 </Project>

AirFighter/AirFighter/nlog.config

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-	<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        autoReload="true" internalLogLevel="Info">
-
-		<targets>
-			<target xsi:type="File" name="tofile" fileName="carlog-${shortdate}.log" />
-		</targets>
-
-		<rules>
-			<logger name="*" minlevel="Debug" writeTo="tofile" />
-		</rules>
-	</nlog>
-</configuration>

AirFighter/AirFighter/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": "AirFighter"
+    }
+  }
+}

тренировочный.txt

@@ -0,0 +1,2 @@
+CollectionsStorage
+11|Massive|45|EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;EntityMilitaryAircraft:100:100:Black;