Лабораторная работа №8

Добавил вывод ошибок в форме
Лабораторная работа №7
2024-05-13 23:55:26 +04:00 · 2024-05-01 15:22:01 +04:00 · 2024-05-01 15:16:31 +04:00 · 2024-04-26 13:29:17 +04:00 · 2024-04-22 16:04:23 +04:00 · 2024-04-20 08:44:17 +04:00
27 changed files with 1196 additions and 188 deletions
--- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/AbstractCompany.cs
+++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/AbstractCompany.cs
@@ -1,4 +1,5 @@
 using ProjectAircraftCarrier_.Drawnings;
+using ProjectAircraftCarrier_.Exceptions;

 namespace ProjectAircraftCarrier_.CollectionGenericObjects;

@@ -48,7 +49,7 @@ public abstract class AbstractCompany
        _pictureWidth = picWidth;
        _pictureHeight = picHeight;
        _collection = collection;
-        _collection.SetMaxCount = GetMaxCount;
+        _collection.MaxCount = GetMaxCount;
    }

    /// <summary>
@@ -59,7 +60,18 @@ public abstract class AbstractCompany
    /// <returns></returns>
    public static int operator +(AbstractCompany company, DrawningWarship warship)
    {
-        return company._collection.Insert(warship, 0);
+        try 
+        {
+            return company._collection.Insert(warship, 0, new DrawningWarshipEqutables());
+        }
+        catch (ObjectAlreadyInCollectionException)
+        {
+            return -1;
+        }
+        catch (CollectionOverflowException)
+        {
+            return -1;
+        }
    }

    /// <summary>
@@ -80,7 +92,14 @@ public abstract class AbstractCompany
    public DrawningWarship? GetRandomObject()
    {
        Random rnd = new();
-        return _collection?.Get(rnd.Next(GetMaxCount));
+        try
+        {
+            return _collection?.Get(rnd.Next(GetMaxCount));
+        }
+        catch (ObjectNotFoundException)
+        {
+            return null;
+        }
    }

    /// <summary>
@@ -96,13 +115,26 @@ public abstract class AbstractCompany
        SetObjectsPosition();
        for (int i = 0; i < (_collection?.Count ?? 0); ++i)
        {
-            DrawningWarship? obj = _collection?.Get(i);
-            obj?.DrawTransport(graphics);
+            try
+            {
+                DrawningWarship? obj = _collection?.Get(i);
+                obj?.DrawTransport(graphics);
+            }
+            catch (ObjectNotFoundException)
+            {
+                continue;
+            }
        }

        return bitmap;
    }

+    /// <summary>
+    /// Сортировка
+    /// </summary>
+    /// <param name="comparer">Сравнитель объектов</param>
+    public void Sort(IComparer<DrawningWarship?> comparer) => _collection?.CollectionSort(comparer);
+
    /// <summary>
    /// Вывод заднего фона
    /// </summary>
@@ -113,4 +145,4 @@ public abstract class AbstractCompany
    /// Расстановка объектов
    /// </summary>
    protected abstract void SetObjectsPosition();
-}
+}
--- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/CollectionInfo.cs
+++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/CollectionInfo.cs
@@ -0,0 +1,77 @@
+namespace ProjectAircraftCarrier_.CollectionGenericObjects;
+
+/// <summary>
+/// Класс, хранящиий информацию по коллекции
+/// </summary>
+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 override int GetHashCode()
+    {
+        return Name.GetHashCode();
+    }
+}
--- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/Docks.cs
+++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/Docks.cs
@@ -1,5 +1,6 @@

 using ProjectAircraftCarrier_.Drawnings;
+using ProjectAircraftCarrier_.Exceptions;

 namespace ProjectAircraftCarrier_.CollectionGenericObjects;

@@ -40,21 +41,28 @@ public class Docks : AbstractCompany

        for (int i = 0; i < (_collection?.Count ?? 0); i++)
        {
-            if (_collection?.Get(i) != null)
+            try
            {
-                int x = 5 + _placeSizeWidth * n;
-                int y = (10 + _placeSizeHeight * (_pictureHeight / _placeSizeHeight - 1)) - _placeSizeHeight * m;
+                if (_collection?.Get(i) != null)
+                {
+                    int x = 5 + _placeSizeWidth * n;
+                    int y = (10 + _placeSizeHeight * (_pictureHeight / _placeSizeHeight - 1)) - _placeSizeHeight * m;

-                _collection?.Get(i)?.SetPictureSize(_pictureWidth, _pictureHeight);
-                _collection?.Get(i)?.SetPosition(x, y);
+                    _collection?.Get(i)?.SetPictureSize(_pictureWidth, _pictureHeight);
+                    _collection?.Get(i)?.SetPosition(x, y);
+                }
+
+                if (n < _pictureWidth / _placeSizeWidth) n++;
+
+                else
+                {
+                    n = 0;
+                    m++;
+                }
            }
-
-            if (n < _pictureWidth / _placeSizeWidth)
-                n++;
-            else
+            catch (ObjectNotFoundException)
            {
-                n = 0;
-                m++;
+                break;
            }
        }
    }
--- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/ICollectionGenericObjects.cs
+++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/ICollectionGenericObjects.cs
@@ -1,4 +1,6 @@
-namespace ProjectAircraftCarrier_.CollectionGenericObjects;
+using ProjectAircraftCarrier_.Drawnings;
+
+namespace ProjectAircraftCarrier_.CollectionGenericObjects;

 /// <summary>
 /// Интерфейс описания действий для набора хранимых объектов
@@ -15,22 +17,24 @@ public interface ICollectionGenericObjects<T>
    /// <summary>
    /// Установка максимального количества элементов
    /// </summary>
-    int SetMaxCount { set; }
+    int MaxCount { get; set; }

    /// <summary>
    /// Добавление объекта в коллекцию
    /// </summary>
    /// <param name="obj">Добавляемый объект</param>
+    /// <param name="comparer">Сравнение двух объектов</param>
    /// <returns>индекс добавленного элемента - вставка прошла удачно, -1 - вставка не удалась</returns>
-    int Insert(T obj);
+    int Insert(T obj, IEqualityComparer<DrawningWarship?>? comparer = null);

    /// <summary>
    /// Добавление объекта в коллекцию на конкретную позицию
    /// </summary>
    /// <param name="obj">Добавляемый объект</param>
    /// <param name="position">Позиция</param>
+    /// <param name="comparer">Сравнение двух объектов</param>
    /// <returns>индекс добавленного элемента - вставка прошла удачно, -1 - вставка не удалась</returns>
-    int Insert(T obj, int position);
+    int Insert(T obj, int position, IEqualityComparer<DrawningWarship?>? comparer = null);

    /// <summary>
    /// Удаление объекта из коллекции с конкретной позиции
@@ -45,5 +49,21 @@ public interface ICollectionGenericObjects<T>
    /// <param name="position">Позиция</param>
    /// <returns>Объект</returns>
    T? Get(int position);
-}

+    /// <summary>
+    /// Получение типа коллекции
+    /// </summary>
+    CollectionType GetCollectionType { get; }
+
+    /// <summary>
+    /// Получение объектов коллекции по одному
+    /// </summary>
+    /// <returns>Поэлементый вывод элементов коллекции</returns>
+    IEnumerable<T?> GetItems();
+
+    /// <summary>
+    /// Сортировка коллекции
+    /// </summary>
+    /// <param name="comparer">Сравнитель объектов</param>
+    void CollectionSort(IComparer<T?> comparer);
+}
--- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/ListGenericObject.cs
+++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/ListGenericObject.cs
@@ -1,78 +0,0 @@
-using System.CodeDom.Compiler;
-
-namespace ProjectAircraftCarrier_.CollectionGenericObjects;
-
-/// <summary>
-/// Параметризованный набор объектов
-/// </summary>
-/// <typeparam name="T">Параметр: ограничение - ссылочный тип</typeparam>
-public class ListGenericObject<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 SetMaxCount { set { if (value > 0) { _maxCount = value; } } }
-
-    /// <summary>
-    /// Конструктор
-    /// </summary>
-    public ListGenericObject()
-    {
-        _collection = new();
-    }
-
-    public T? Get(int position)
-    {
-        if (position < 0 || position >= Count)
-        {
-            return null;
-        }
-
-        return _collection[position];
-    }
-
-    public int Insert(T obj)
-    {
-        if (Count == _maxCount)
-        {
-            return -1;
-        }
-        
-        _collection.Add(obj);
-        return _collection.Count;
-    }
-
-    public int Insert(T obj, int position)
-    {
-        if (Count == _maxCount || position < 0 || position > Count)
-        {
-            return -1;
-        }
-        
-        _collection.Insert(position, obj);
-        return position;
-    }
-
-    public T? Remove(int position)
-    {
-        if (position < 0 || position > Count)
-        {
-            return null;
-        }
-
-        T? obj = _collection[position];
-        _collection.RemoveAt(position);
-
-        return obj;
-    }
-}
--- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/ListGenericObjects.cs
+++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/ListGenericObjects.cs
@@ -0,0 +1,122 @@
+using ProjectAircraftCarrier_.Drawnings;
+using ProjectAircraftCarrier_.Exceptions;
+
+namespace ProjectAircraftCarrier_.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 { get { return _collection.Count; } set { if (value > 0) { _maxCount = value; } } }
+
+    public CollectionType GetCollectionType => CollectionType.List;
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public ListGenericObjects()
+    {
+        _collection = new();
+    }
+
+    public T? Get(int position)
+    {
+        // TODO выброс ошибки, если выход за границы списка
+        if (position < 0 || position >= Count)
+        {
+            throw new PositionOutOfCollectionException(position);
+        }
+
+        return _collection[position];
+    }
+
+    public int Insert(T obj, IEqualityComparer<DrawningWarship?>? comparer = null)
+    {
+        // TODO выброс ошибки, если переполнение
+        // TODO выброс ошибки, если такой объект есть в коллекции
+        if (Count == _maxCount)
+        {
+            throw new CollectionOverflowException(Count);
+        }
+
+        for (int i = 0; i < Count; i++)
+        {
+            if (comparer.Equals((_collection[i] as DrawningWarship), (obj as DrawningWarship)))
+            {
+                throw new ObjectAlreadyInCollectionException(i);
+            }
+        }
+
+        _collection.Add(obj);
+        return _collection.Count;
+    }
+
+    public int Insert(T obj, int position, IEqualityComparer<DrawningWarship?>? comparer = null)
+    {
+        // TODO выброс ошибки, если выход за границы списка
+        // TODO выброс ошибки, если переполнение
+        // TODO выброс ошибки, если такой объект есть в коллекции
+        if (position < 0 || position > Count)
+        {
+            throw new PositionOutOfCollectionException(position);
+        }
+
+        if (Count == _maxCount)
+        {
+            throw new CollectionOverflowException(Count);
+        }
+
+        for (int i = 0; i < Count; i++)
+        {
+            if (comparer.Equals((_collection[i] as DrawningWarship), (obj as DrawningWarship)))
+            {
+                throw new ObjectAlreadyInCollectionException(i);
+            }
+        }
+
+        _collection.Insert(position, obj);
+        return position;
+    }
+
+    public T? Remove(int position)
+    {
+        // TODO выброс ошибки, если выход за границы списка
+        if (position < 0 || position > Count)
+        {
+            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)
+    {
+        // TODO
+        _collection.Sort(comparer);
+    }
+}
--- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/MassiveGenericObjects.cs
+++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/MassiveGenericObjects.cs
@@ -1,4 +1,7 @@
-namespace ProjectAircraftCarrier_.CollectionGenericObjects;
+using ProjectAircraftCarrier_.Drawnings;
+using ProjectAircraftCarrier_.Exceptions;
+
+namespace ProjectAircraftCarrier_.CollectionGenericObjects;

 /// <summary>
 /// Параметризованный набор объектов
@@ -14,8 +17,12 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>

    public int Count => _collection.Length;

-    public int SetMaxCount
+    public int MaxCount
    {
+        get
+        {
+            return _collection.Length;
+        }
        set
        {
            if (value > 0)
@@ -32,6 +39,8 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
        }
    }

+    public CollectionType GetCollectionType => CollectionType.Massive;
+
    /// <summary>
    /// Конструктор
    /// </summary>
@@ -42,15 +51,32 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>

    public T? Get(int position)
    {
+        // TODO выброс ошибки, если выход за границы массива
+        // TODO выброс ошибки, если объект пустой
        if (position < 0 || position >= Count)
        {
-            return null;
+            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<DrawningWarship?>? comparer = null)
    {
+        // TODO выброс ошибки, если такой объект есть в коллекции
+        // TODO выброс ошибки, если переполнение
+        for (int i = 0; i < Count; i++)
+        {
+            if (comparer.Equals((_collection[i] as DrawningWarship), (obj as DrawningWarship)))
+            {
+                throw new ObjectAlreadyInCollectionException(i);
+            }
+        }
+
        for (int i = 0; i < Count; i++)
        {
            if (_collection[i] == null)
@@ -59,14 +85,26 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
                return i;
            }
        }
-        return -1;
+
+        throw new CollectionOverflowException(Count);
    }

-    public int Insert(T obj, int position)
+    public int Insert(T obj, int position, IEqualityComparer<DrawningWarship?>? comparer = null)
    {
+        // TODO выброс ошибки, если выход за границы массива
+        // TODO выброс ошибки, если такой объект есть в коллекции
+        // TODO выброс ошибки, если переполнение
        if (position < 0 || position >= Count)
        {
-            return -1;
+            throw new PositionOutOfCollectionException(position);
+        }
+
+        for (int i = 0; i < Count; i++)
+        {
+            if (comparer.Equals((_collection[i] as DrawningWarship), (obj as DrawningWarship)))
+            {
+                throw new ObjectAlreadyInCollectionException(i);
+            }
        }

        if (_collection[position] == null)
@@ -93,19 +131,38 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
            }
        }

-        return -1;
+        throw new CollectionOverflowException(Count);
    }

    public T? Remove(int position)
    {
-        if (position < 0 || position >= Count || _collection[position] == null)
+        // TODO выброс ошибки, если выход за границы массива
+        // TODO выброс ошибки, если объект пустой
+        if (position < 0 || position >= Count)
        {
-            return null;
+            throw new PositionOutOfCollectionException(position);
+        }
+        if (_collection[position] == null)
+        {
+            throw new ObjectNotFoundException(position);
        }

        T? obj = _collection[position];
        _collection[position] = null;
        return obj;
    }
-}

+    public IEnumerable<T?> GetItems()
+    {
+        for (int i = 0; i < _collection.Length; ++i)
+        {
+            yield return _collection[i];
+        }
+    }
+
+    public void CollectionSort(IComparer<T?> comparer)
+    {
+        // TODO
+        Array.Sort(_collection, comparer);
+    }
+}
--- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/StorageCollection.cs
+++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/StorageCollection.cs
@@ -1,6 +1,5 @@
 using ProjectAircraftCarrier_.Drawnings;
-using ProjectAircraftCarrier_.CollectionGenericObjects;
-using System.Xml.Linq;
+using ProjectAircraftCarrier_.Exceptions;

 namespace ProjectAircraftCarrier_.CollectionGenericObjects;

@@ -9,46 +8,59 @@ namespace ProjectAircraftCarrier_.CollectionGenericObjects;
 /// </summary>
 /// <typeparam name="T"></typeparam>
 public class StorageCollection<T>
-    where T : class
+    where T : DrawningWarship
 {
    /// <summary>
    /// Словарь (хранилище) с коллекциями
    /// </summary>
-    readonly Dictionary<string, ICollectionGenericObjects<T>> _storages;
+    readonly Dictionary<CollectionInfo, ICollectionGenericObjects<T>> _storages;

    /// <summary>
    /// Возвращение списка названий коллекций
    /// </summary>
-    public List<string> Keys => _storages.Keys.ToList();
+    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<string, ICollectionGenericObjects<T>>();
+        _storages = new Dictionary<CollectionInfo, ICollectionGenericObjects<T>>();
    }

    /// <summary>
    /// Добавление коллекции в хранилище
    /// </summary>
-    /// <param name="name">Название коллекции</param>
+    /// <param name="info">Название коллекции</param>
    /// <param name="collectionType">Тип коллекции</param>
-    public void AddCollection(string name, CollectionType collectionType)
+    public void AddCollection(CollectionInfo info)
    {
-        if (name == null || _storages.ContainsKey(name))
+        if (info == null || _storages.ContainsKey(info))
        {
            return;
        }

-        if (collectionType == CollectionType.Massive)
+        if (info.CollectionType == CollectionType.Massive)
        {
-            _storages.Add(name, new MassiveGenericObjects<T>());
+            _storages.Add(info, new MassiveGenericObjects<T>());
        }

-        if (collectionType == CollectionType.List)
+        if (info.CollectionType == CollectionType.List)
        {
-            _storages.Add(name, new ListGenericObject<T>());
+            _storages.Add(info, new ListGenericObjects<T>());
        }
    }

@@ -56,14 +68,14 @@ public class StorageCollection<T>
    /// Удаление коллекции
    /// </summary>
    /// <param name="name">Название коллекции</param>
-    public void DelCollection(string name)
+    public void DelCollection(CollectionInfo info)
    {
-        if (name == null || !_storages.ContainsKey(name))
+        if (info == null || !_storages.ContainsKey(info))
        {
            return;
        }

-        _storages.Remove(name);
+        _storages.Remove(info);
    }

    /// <summary>
@@ -71,16 +83,146 @@ public class StorageCollection<T>
    /// </summary>
    /// <param name="name">Название коллекции</param>
    /// <returns></returns>
-    public ICollectionGenericObjects<T>? this[string name]
+    public ICollectionGenericObjects<T>? this[CollectionInfo info]
    {
        get
        {
-            if (_storages.ContainsKey(name))
+            if (_storages.ContainsKey(info))
            {
-                return _storages[name];
+                return _storages[info];
            }
            
            return null;
        }
    }
+
+    /// <summary>
+    /// Сохранение информации по автомобилям в хранилище в файл
+    /// </summary>
+    /// <param name="filename">Путь и имя файла</param>
+    public void SaveData(string filename)
+    {
+        if (_storages.Count == 0)
+        {
+            throw new NullReferenceException("В хранилище отсутствуют коллекции для сохранения");
+        }
+
+        if (File.Exists(filename))
+        {
+            File.Delete(filename);
+        }
+
+        using (StreamWriter sw = new StreamWriter(filename))
+        {
+            sw.Write(_collectionKey);
+
+            foreach (KeyValuePair<CollectionInfo, ICollectionGenericObjects<T>> value in _storages)
+            {
+                sw.Write(Environment.NewLine);
+                // не сохраняем пустые коллекции
+                if (value.Value.Count == 0)
+                {
+                    continue;
+                }
+
+                sw.Write(value.Key);
+                sw.Write(_separatorForKeyValue);
+                sw.Write(value.Value.MaxCount);
+                sw.Write(_separatorForKeyValue);
+
+                foreach (T? item in value.Value.GetItems())
+                {
+                    string data = item?.GetDataForSave() ?? string.Empty;
+
+                    if (string.IsNullOrEmpty(data))
+                    {
+                        continue;
+                    }
+                    sw.Write(data);
+                    sw.Write(_separatorItems);
+                }
+            }
+        }
+    }
+
+    /// <summary>
+    /// Загрузка информации по автомобилям в хранилище из файла
+    /// </summary>
+    /// <param name="filename">Путь и имя файла</param>
+    public void LoadData(string filename)
+    {
+        if (!File.Exists(filename))
+        {
+            throw new FileNotFoundException("Файл не существует");
+        }
+
+        using (StreamReader sr = new(filename))
+        {
+            string line = sr.ReadLine();
+
+            if (line == null || line.Length == 0)
+            {
+                throw new FileFormatException("В файле нет данных");
+            }
+            if (!line.Equals(_collectionKey))
+            {
+                throw new FileFormatException("В файле неверные данные");
+            }
+            _storages.Clear();
+
+            while ((line = sr.ReadLine()) != null)
+            {
+                string[] record = line.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
+                if (record.Length != 3)
+                {
+                    continue;
+                }
+
+                CollectionInfo? collectionInfo = CollectionInfo.GetCollectionInfo(record[0]) ?? 
+                    throw new Exception("Не удалось определить информацию коллекции: " + record[0]);
+                ICollectionGenericObjects<T> ? collection = StorageCollection<T>.CreateCollection(collectionInfo.CollectionType) ?? 
+                    throw new Exception("Не удалось создать коллекцию");
+                collection.MaxCount = Convert.ToInt32(record[1]);
+
+                string[] set = record[2].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
+                foreach (string elem in set)
+                {
+                    if (elem?.CreateDrawningWarship() is T warship)
+                    {
+                        try
+                        {
+                            if (collection.Insert(warship, new DrawningWarshipEqutables()) == -1)
+                            {
+                                throw new InvalidOperationException("Объект не удалось добавить в коллекцию: " + record[3]);
+                            }
+                        }
+                        catch (CollectionOverflowException ex)
+                        {
+                            throw new OverflowException("Коллекция переполнена", ex);
+                        }
+                        catch (ObjectAlreadyInCollectionException ex)
+                        {
+                            throw new InvalidOperationException("Объект уже присутствует в коллекции", ex);
+                        }
+                    }
+                }
+                _storages.Add(collectionInfo, collection);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Создание коллекции по типу
+    /// </summary>
+    /// <param name="collectionType"></param>
+    /// <returns></returns>
+    private static ICollectionGenericObjects<T>? CreateCollection(CollectionType collectionType)
+    {
+        return collectionType switch
+        {
+            CollectionType.Massive => new MassiveGenericObjects<T>(),
+            CollectionType.List => new ListGenericObjects<T>(),
+            _ => null,
+        };
+    }
 }
--- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Drawnings/DrawningAircraftCarrier.cs
+++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Drawnings/DrawningAircraftCarrier.cs
@@ -17,9 +17,20 @@ public class DrawningAircraftCarrier : DrawningWarship
    /// <param name="deckForAircraftTakeOff">Палуба для взлета самолетов</param>
    /// <param name="controlCabin">Рубка управления</param>
    /// <param name="fighterJet">Истребитель</param>
-    public DrawningAircraftCarrier(int speed, double weight, Color bodyColor, Color additionalColor, bool deckForAircraftTakeOff, bool controlCabin, bool fighterJet) : base(140, 50)
+    public DrawningAircraftCarrier(int speed, double weight, Color bodyColor, Color additionalColor, 
+        bool deckForAircraftTakeOff, bool controlCabin, bool fighterJet) : base(140, 50)
    {
-        EntityWarship = new EntityAircraftCarrier(speed, weight, bodyColor, additionalColor, deckForAircraftTakeOff, controlCabin, fighterJet);
+        EntityWarship = new EntityAircraftCarrier(speed, weight, bodyColor, additionalColor, 
+            deckForAircraftTakeOff, controlCabin, fighterJet);
+    }
+
+    /// <summary>
+    /// Конструктор для класса Extention
+    /// </summary>
+    /// <param name="airplan"></param>
+    public DrawningAircraftCarrier(EntityWarship? aircraftCarrier) : base(aircraftCarrier)
+    {
+        EntityWarship = aircraftCarrier;
    }

    public override void DrawTransport(Graphics g)
--- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Drawnings/DrawningWarship.cs
+++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Drawnings/DrawningWarship.cs
@@ -95,6 +95,15 @@ public class DrawningWarship
        _drawningWarshipHeight = DrawningWarshiprierHeight;
    }

+    /// <summary>
+    /// Конструктор для класса Extention
+    /// </summary>
+    /// <param name="warship"></param>
+    public DrawningWarship(EntityWarship? warship) : this()
+    {
+        EntityWarship = warship;
+    }
+
    /// <summary>
    /// Установка границ поля
    /// </summary>
--- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Drawnings/DrawningWarshipCompareByColor.cs
+++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Drawnings/DrawningWarshipCompareByColor.cs
@@ -0,0 +1,42 @@
+using ProjectAircraftCarrier_.Entities;
+
+namespace ProjectAircraftCarrier_.Drawnings;
+
+/// <summary>
+/// Сравнение по цвету, скорости, весу
+/// </summary>
+public class DrawningWarshipCompareByColor : IComparer<DrawningWarship?>
+{
+    public int Compare(DrawningWarship? x, DrawningWarship? y)
+    {
+        // TODO прописать логику сравения по цветам, скорости, весу
+        if (x == null || x.EntityWarship == null)
+        {
+            return 1;
+        }
+        if (y == null || y.EntityWarship == null)
+        {
+            return -1;
+        }
+        var bodyColorCompare = y.EntityWarship.BodyColor.Name.CompareTo(x.EntityWarship.BodyColor.Name);
+        if (bodyColorCompare != 0)
+        {
+            return bodyColorCompare;
+        }
+        if (x is DrawningAircraftCarrier && y is DrawningAircraftCarrier)
+        {
+            var additionalColorCompare = (y.EntityWarship as EntityAircraftCarrier).AdditionalColor.Name.CompareTo(
+                (x.EntityWarship as EntityAircraftCarrier).AdditionalColor.Name);
+            if (additionalColorCompare != 0)
+            {
+                return additionalColorCompare;
+            }
+        }
+        var speedCompare = y.EntityWarship.Speed.CompareTo(x.EntityWarship.Speed);
+        if (speedCompare != 0)
+        {
+            return speedCompare;
+        }
+        return y.EntityWarship.Weight.CompareTo(x.EntityWarship.Weight);
+    }
+}
--- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Drawnings/DrawningWarshipCompareByType.cs
+++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Drawnings/DrawningWarshipCompareByType.cs
@@ -0,0 +1,29 @@
+namespace ProjectAircraftCarrier_.Drawnings;
+
+/// <summary>
+/// Сравнение по типу, скорости, весу
+/// </summary>
+public class DrawningWarshipCompareByType : IComparer<DrawningWarship?>
+{
+    public int Compare(DrawningWarship? x, DrawningWarship? y)
+    {
+        if (x == null || x.EntityWarship == null)
+        {
+            return 1;
+        }
+        if (y == null || y.EntityWarship == null)
+        {
+            return -1;
+        }
+        if (x.GetType().Name != y.GetType().Name)
+        {
+            return y.GetType().Name.CompareTo(x.GetType().Name);
+        }
+        var speedCompare = y.EntityWarship.Speed.CompareTo(x.EntityWarship.Speed);
+        if (speedCompare != 0)
+        {
+            return speedCompare;
+        }
+        return y.EntityWarship.Weight.CompareTo(x.EntityWarship.Weight);
+    }
+}
--- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Drawnings/DrawningWarshipEqutables.cs
+++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Drawnings/DrawningWarshipEqutables.cs
@@ -0,0 +1,68 @@
+using ProjectAircraftCarrier_.Entities;
+using System.Diagnostics.CodeAnalysis;
+
+namespace ProjectAircraftCarrier_.Drawnings;
+
+/// <summary>
+/// Реализация сравнения двух объектов класса-прорисовки
+/// </summary>
+public class DrawningWarshipEqutables : IEqualityComparer<DrawningWarship?>
+{
+    public bool Equals(DrawningWarship? x, DrawningWarship? y)
+    {
+        if (x == null || x.EntityWarship == null)
+        {
+            return false;
+        }
+        if (y == null || y.EntityWarship == null)
+        {
+            return false;
+        }
+        if (x.GetType().Name != y.GetType().Name)
+        {
+            return false;
+        }
+        if (x.EntityWarship.Speed != y.EntityWarship.Speed)
+        {
+            return false;
+        }
+        if (x.EntityWarship.Weight != y.EntityWarship.Weight)
+        {
+            return false;
+        }
+        if (x.EntityWarship.BodyColor != y.EntityWarship.BodyColor)
+        {
+            return false;
+        }
+        if (x is DrawningAircraftCarrier && y is DrawningAircraftCarrier)
+        {
+            // TODO доделать логику сравнения дополнительных параметров
+            if ((x.EntityWarship as EntityAircraftCarrier)?.AdditionalColor != 
+                (y.EntityWarship as EntityAircraftCarrier)?.AdditionalColor)
+            {
+                return false;
+            }
+            if ((x.EntityWarship as EntityAircraftCarrier)?.DeckForAircraftTakeOff !=
+                (y.EntityWarship as EntityAircraftCarrier)?.DeckForAircraftTakeOff)
+            {
+                return false;
+            }
+            if ((x.EntityWarship as EntityAircraftCarrier)?.ControlCabin !=
+                (y.EntityWarship as EntityAircraftCarrier)?.ControlCabin)
+            {
+                return false;
+            }
+            if ((x.EntityWarship as EntityAircraftCarrier)?.FighterJet !=
+                (y.EntityWarship as EntityAircraftCarrier)?.FighterJet)
+            {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public int GetHashCode([DisallowNull] DrawningWarship? obj)
+    {
+        return obj.GetHashCode();
+    }
+}
--- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Drawnings/ExtentionDrawningWarship.cs
+++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Drawnings/ExtentionDrawningWarship.cs
@@ -0,0 +1,56 @@
+using ProjectAircraftCarrier_.Drawnings;
+using ProjectAircraftCarrier_.Entities;
+
+namespace ProjectAircraftCarrier_.Drawnings;
+
+/// <summary>
+/// Расширение для класса EntityWarship
+/// </summary>
+public static class ExtentionDrawningWarship
+{
+    /// <summary>
+    /// Разделитель для записи информации по объекту в файл
+    /// </summary>
+    private static readonly string _separatorForObject = ":";
+
+    /// <summary>
+    /// Создание объекта из строки
+    /// </summary>
+    /// <param name="info">Строка с данными для создания объекта</param>
+    /// <returns>Объект</returns>
+    public static DrawningWarship? CreateDrawningWarship(this string info)
+    {
+        string[] strs = info.Split(_separatorForObject);
+        EntityWarship? warship = EntityAircraftCarrier.CreateEntityAircraftCarrier(strs);
+        if (warship != null)
+        {
+            return new DrawningAircraftCarrier(warship);
+        }
+
+        warship = EntityWarship.CreateEntityWarship(strs);
+        if (warship != null)
+        {
+            return new DrawningWarship(warship);
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    /// Получение данных для сохранения в файл
+    /// </summary>
+    /// <param name="drawningWarship">Сохраняемый объект</param>
+    /// <returns>Строка с данными по объекту</returns>
+    public static string GetDataForSave(this DrawningWarship drawningWarship)
+    {
+        string[]? array = drawningWarship?.EntityWarship?.GetStringRepresentation();
+
+        if (array == null)
+        {
+            return string.Empty;
+        }
+
+        return string.Join(_separatorForObject, array);
+    }
+
+}
--- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Entities/EntityAircraftCarrier.cs
+++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Entities/EntityAircraftCarrier.cs
@@ -51,4 +51,35 @@ public class EntityAircraftCarrier : EntityWarship
    {
        AdditionalColor = newColor;
    }
+
+    public override string[] GetStringRepresentation()
+    {
+        return new[] 
+        { 
+            nameof(EntityAircraftCarrier), 
+            Speed.ToString(), 
+            Weight.ToString(), 
+            BodyColor.Name, 
+            AdditionalColor.Name,
+            DeckForAircraftTakeOff.ToString(),
+            ControlCabin.ToString(),
+            FighterJet.ToString()
+        };
+    }
+
+    /// <summary>
+    /// Создание объекта из массива строк
+    /// </summary>
+    /// <param name="strs"></param>
+    /// <returns></returns>
+    public static EntityAircraftCarrier? CreateEntityAircraftCarrier(string[] strs)
+    {
+        if (strs.Length != 8 || strs[0] != nameof(EntityAircraftCarrier))
+        {
+            return null;
+        }
+
+        return new EntityAircraftCarrier(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]), 
+            Color.FromName(strs[4]), Convert.ToBoolean(strs[5]), Convert.ToBoolean(strs[6]), Convert.ToBoolean(strs[7]));
+    }
 }
--- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Entities/EntityWarship.cs
+++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Entities/EntityWarship.cs
@@ -46,4 +46,28 @@ public class EntityWarship
    {
        BodyColor = newColor;
    }
+
+    /// <summary>
+    /// Получение строк со значениями свойств объекта класса-сущности
+    /// </summary>
+    /// <returns></returns>
+    public virtual string[] GetStringRepresentation()
+    {
+        return new[] { nameof(EntityWarship), Speed.ToString(), Weight.ToString(), BodyColor.Name };
+    }
+
+    /// <summary>
+    /// Создание объекта из массива строк
+    /// </summary>
+    /// <param name="strs"></param>
+    /// <returns></returns>
+    public static EntityWarship? CreateEntityWarship(string[] strs)
+    {
+        if (strs.Length != 4 || strs[0] != nameof(EntityWarship))
+        {
+            return null;
+        }
+
+        return new EntityWarship(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]));
+    }
 }
--- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Exceptions/CollectionOverflowException.cs
+++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Exceptions/CollectionOverflowException.cs
@@ -0,0 +1,20 @@
+using System.Runtime.Serialization;
+
+namespace ProjectAircraftCarrier_.Exceptions;
+
+/// <summary>
+/// Класс, описывающий ошибку переполнения коллекции
+/// </summary>
+[Serializable]
+internal 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) { }
+}
--- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Exceptions/ObjectAlreadyInCollectionException.cs
+++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Exceptions/ObjectAlreadyInCollectionException.cs
@@ -0,0 +1,20 @@
+using System.Runtime.Serialization;
+
+namespace ProjectAircraftCarrier_.Exceptions;
+
+/// <summary>
+/// Класс, описывающий ошибку переполнения коллекции
+/// </summary>
+[Serializable]
+internal class ObjectAlreadyInCollectionException : ApplicationException
+{
+    public ObjectAlreadyInCollectionException(int index) : base("Такой объект уже присутствует в коллекции. Позиция " + index) { }
+
+    public ObjectAlreadyInCollectionException() : base() { }
+
+    public ObjectAlreadyInCollectionException(string message) : base(message) { }
+
+    public ObjectAlreadyInCollectionException(string message, Exception exception) : base(message, exception) { }
+
+    protected ObjectAlreadyInCollectionException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
+}
--- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Exceptions/ObjectNotFoundException.cs
+++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Exceptions/ObjectNotFoundException.cs
@@ -0,0 +1,20 @@
+using System.Runtime.Serialization;
+
+namespace ProjectAircraftCarrier_.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) { }
+}
--- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Exceptions/PositionOutOfCollectionException.cs
+++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Exceptions/PositionOutOfCollectionException.cs
@@ -0,0 +1,20 @@
+using System.Runtime.Serialization;
+
+namespace ProjectAircraftCarrier_.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) { }
+}
--- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormWarshipCollection.Designer.cs
+++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormWarshipCollection.Designer.cs
@@ -30,6 +30,9 @@
        {
            groupBoxTools = new GroupBox();
            panelCompanyTools = new Panel();
+            buttonSortByColor = new Button();
+            buttonSortByType = new Button();
+            buttonAddWarship = new Button();
            maskedTextBoxPosition = new MaskedTextBox();
            buttonRefresh = new Button();
            buttonRemoveWarship = new Button();
@@ -45,11 +48,17 @@
            labelCollectionName = new Label();
            comboBoxSelectorCompany = new ComboBox();
            pictureBox = new PictureBox();
-            buttonAddWarship = new Button();
+            menuStrip = new MenuStrip();
+            файлToolStripMenuItem = new ToolStripMenuItem();
+            saveToolStripMenuItem = new ToolStripMenuItem();
+            loadToolStripMenuItem = new ToolStripMenuItem();
+            saveFileDialog = new SaveFileDialog();
+            openFileDialog = new OpenFileDialog();
            groupBoxTools.SuspendLayout();
            panelCompanyTools.SuspendLayout();
            panelStorage.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
+            menuStrip.SuspendLayout();
            SuspendLayout();
            // 
            // groupBoxTools
@@ -59,15 +68,17 @@
            groupBoxTools.Controls.Add(panelStorage);
            groupBoxTools.Controls.Add(comboBoxSelectorCompany);
            groupBoxTools.Dock = DockStyle.Right;
-            groupBoxTools.Location = new Point(1176, 0);
+            groupBoxTools.Location = new Point(1114, 38);
            groupBoxTools.Name = "groupBoxTools";
-            groupBoxTools.Size = new Size(326, 961);
+            groupBoxTools.Size = new Size(326, 963);
            groupBoxTools.TabIndex = 0;
            groupBoxTools.TabStop = false;
            groupBoxTools.Text = "Инструменты";
            // 
            // panelCompanyTools
            // 
+            panelCompanyTools.Controls.Add(buttonSortByColor);
+            panelCompanyTools.Controls.Add(buttonSortByType);
            panelCompanyTools.Controls.Add(buttonAddWarship);
            panelCompanyTools.Controls.Add(maskedTextBoxPosition);
            panelCompanyTools.Controls.Add(buttonRefresh);
@@ -75,14 +86,47 @@
            panelCompanyTools.Controls.Add(buttonGoToCheck);
            panelCompanyTools.Dock = DockStyle.Bottom;
            panelCompanyTools.Enabled = false;
-            panelCompanyTools.Location = new Point(3, 529);
+            panelCompanyTools.Location = new Point(3, 509);
            panelCompanyTools.Name = "panelCompanyTools";
-            panelCompanyTools.Size = new Size(320, 429);
+            panelCompanyTools.Size = new Size(320, 451);
            panelCompanyTools.TabIndex = 9;
            // 
+            // buttonSortByColor
+            // 
+            buttonSortByColor.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonSortByColor.Location = new Point(3, 386);
+            buttonSortByColor.Name = "buttonSortByColor";
+            buttonSortByColor.Size = new Size(314, 60);
+            buttonSortByColor.TabIndex = 8;
+            buttonSortByColor.Text = "Сортировка по цвету";
+            buttonSortByColor.UseVisualStyleBackColor = true;
+            buttonSortByColor.Click += ButtonSortByColor_Click;
+            // 
+            // buttonSortByType
+            // 
+            buttonSortByType.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonSortByType.Location = new Point(3, 320);
+            buttonSortByType.Name = "buttonSortByType";
+            buttonSortByType.Size = new Size(314, 60);
+            buttonSortByType.TabIndex = 7;
+            buttonSortByType.Text = "Сортировка по типу";
+            buttonSortByType.UseVisualStyleBackColor = true;
+            buttonSortByType.Click += ButtonSortByType_Click;
+            // 
+            // buttonAddWarship
+            // 
+            buttonAddWarship.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddWarship.Location = new Point(3, 3);
+            buttonAddWarship.Name = "buttonAddWarship";
+            buttonAddWarship.Size = new Size(314, 73);
+            buttonAddWarship.TabIndex = 1;
+            buttonAddWarship.Text = "Добавление военного корабля";
+            buttonAddWarship.UseVisualStyleBackColor = true;
+            buttonAddWarship.Click += ButtonAddWarship_Click;
+            // 
            // maskedTextBoxPosition
            // 
-            maskedTextBoxPosition.Location = new Point(3, 159);
+            maskedTextBoxPosition.Location = new Point(3, 81);
            maskedTextBoxPosition.Mask = "00";
            maskedTextBoxPosition.Name = "maskedTextBoxPosition";
            maskedTextBoxPosition.Size = new Size(314, 35);
@@ -92,9 +136,9 @@
            // buttonRefresh
            // 
            buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRefresh.Location = new Point(3, 356);
+            buttonRefresh.Location = new Point(3, 254);
            buttonRefresh.Name = "buttonRefresh";
-            buttonRefresh.Size = new Size(314, 72);
+            buttonRefresh.Size = new Size(314, 60);
            buttonRefresh.TabIndex = 6;
            buttonRefresh.Text = "Обновить";
            buttonRefresh.UseVisualStyleBackColor = true;
@@ -103,9 +147,9 @@
            // buttonRemoveWarship
            // 
            buttonRemoveWarship.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRemoveWarship.Location = new Point(3, 200);
+            buttonRemoveWarship.Location = new Point(3, 122);
            buttonRemoveWarship.Name = "buttonRemoveWarship";
-            buttonRemoveWarship.Size = new Size(314, 72);
+            buttonRemoveWarship.Size = new Size(314, 60);
            buttonRemoveWarship.TabIndex = 4;
            buttonRemoveWarship.Text = "Удаление военного корабля";
            buttonRemoveWarship.UseVisualStyleBackColor = true;
@@ -114,9 +158,9 @@
            // buttonGoToCheck
            // 
            buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonGoToCheck.Location = new Point(3, 278);
+            buttonGoToCheck.Location = new Point(3, 188);
            buttonGoToCheck.Name = "buttonGoToCheck";
-            buttonGoToCheck.Size = new Size(314, 72);
+            buttonGoToCheck.Size = new Size(314, 60);
            buttonGoToCheck.TabIndex = 5;
            buttonGoToCheck.Text = "Передать на тесты";
            buttonGoToCheck.UseVisualStyleBackColor = true;
@@ -124,7 +168,7 @@
            // 
            // buttonCreateCompany
            // 
-            buttonCreateCompany.Location = new Point(6, 472);
+            buttonCreateCompany.Location = new Point(6, 463);
            buttonCreateCompany.Name = "buttonCreateCompany";
            buttonCreateCompany.Size = new Size(314, 40);
            buttonCreateCompany.TabIndex = 8;
@@ -220,7 +264,7 @@
            comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
            comboBoxSelectorCompany.FormattingEnabled = true;
            comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
-            comboBoxSelectorCompany.Location = new Point(6, 428);
+            comboBoxSelectorCompany.Location = new Point(6, 419);
            comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
            comboBoxSelectorCompany.Size = new Size(314, 38);
            comboBoxSelectorCompany.TabIndex = 0;
@@ -229,30 +273,62 @@
            // pictureBox
            // 
            pictureBox.Dock = DockStyle.Fill;
-            pictureBox.Location = new Point(0, 0);
+            pictureBox.Location = new Point(0, 38);
            pictureBox.Name = "pictureBox";
-            pictureBox.Size = new Size(1176, 961);
+            pictureBox.Size = new Size(1114, 963);
            pictureBox.TabIndex = 1;
            pictureBox.TabStop = false;
            // 
-            // buttonAddWarship
+            // menuStrip
            // 
-            buttonAddWarship.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonAddWarship.Location = new Point(3, 3);
-            buttonAddWarship.Name = "buttonAddWarship";
-            buttonAddWarship.Size = new Size(314, 72);
-            buttonAddWarship.TabIndex = 1;
-            buttonAddWarship.Text = "Добавление военного корабля";
-            buttonAddWarship.UseVisualStyleBackColor = true;
-            buttonAddWarship.Click += ButtonAddWarship_Click;
+            menuStrip.ImageScalingSize = new Size(28, 28);
+            menuStrip.Items.AddRange(new ToolStripItem[] { файлToolStripMenuItem });
+            menuStrip.Location = new Point(0, 0);
+            menuStrip.Name = "menuStrip";
+            menuStrip.Size = new Size(1440, 38);
+            menuStrip.TabIndex = 2;
+            menuStrip.Text = "menuStrip";
+            // 
+            // файлToolStripMenuItem
+            // 
+            файлToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { saveToolStripMenuItem, loadToolStripMenuItem });
+            файлToolStripMenuItem.Name = "файлToolStripMenuItem";
+            файлToolStripMenuItem.Size = new Size(80, 34);
+            файлToolStripMenuItem.Text = "Файл";
+            // 
+            // saveToolStripMenuItem
+            // 
+            saveToolStripMenuItem.Name = "saveToolStripMenuItem";
+            saveToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.S;
+            saveToolStripMenuItem.Size = new Size(317, 40);
+            saveToolStripMenuItem.Text = "Сохранение";
+            saveToolStripMenuItem.Click += SaveToolStripMenuItem_Click;
+            // 
+            // loadToolStripMenuItem
+            // 
+            loadToolStripMenuItem.Name = "loadToolStripMenuItem";
+            loadToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.L;
+            loadToolStripMenuItem.Size = new Size(317, 40);
+            loadToolStripMenuItem.Text = "Загрузка";
+            loadToolStripMenuItem.Click += LoadToolStripMenuItem_Click;
+            // 
+            // saveFileDialog
+            // 
+            saveFileDialog.Filter = "txt file | *.txt";
+            // 
+            // openFileDialog
+            // 
+            openFileDialog.Filter = "txt file | *.txt";
            // 
            // FormWarshipCollection
            // 
            AutoScaleDimensions = new SizeF(12F, 30F);
            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(1502, 961);
+            ClientSize = new Size(1440, 1001);
            Controls.Add(pictureBox);
            Controls.Add(groupBoxTools);
+            Controls.Add(menuStrip);
+            MainMenuStrip = menuStrip;
            Name = "FormWarshipCollection";
            Text = "Коллекция военных кораблей";
            groupBoxTools.ResumeLayout(false);
@@ -261,7 +337,10 @@
            panelStorage.ResumeLayout(false);
            panelStorage.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
+            menuStrip.ResumeLayout(false);
+            menuStrip.PerformLayout();
            ResumeLayout(false);
+            PerformLayout();
        }

        #endregion
@@ -284,5 +363,13 @@
        private Button buttonCreateCompany;
        private Panel panelCompanyTools;
        private Button buttonAddWarship;
+        private MenuStrip menuStrip;
+        private ToolStripMenuItem файлToolStripMenuItem;
+        private ToolStripMenuItem saveToolStripMenuItem;
+        private ToolStripMenuItem loadToolStripMenuItem;
+        private SaveFileDialog saveFileDialog;
+        private OpenFileDialog openFileDialog;
+        private Button buttonSortByColor;
+        private Button buttonSortByType;
    }
 }
--- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormWarshipCollection.cs
+++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormWarshipCollection.cs
@@ -1,5 +1,7 @@
-using ProjectAircraftCarrier_.CollectionGenericObjects;
+using Microsoft.Extensions.Logging;
+using ProjectAircraftCarrier_.CollectionGenericObjects;
 using ProjectAircraftCarrier_.Drawnings;
+using ProjectAircraftCarrier_.Exceptions;

 namespace ProjectAircraftCarrier_;

@@ -18,13 +20,19 @@ public partial class FormWarshipCollection : Form
    /// </summary>
    private AbstractCompany? _company = null;

+    /// <summary>
+    /// Логер
+    /// </summary>
+    private readonly ILogger _logger;
+
    /// <summary>
    /// Конструктор
    /// </summary>
-    public FormWarshipCollection()
+    public FormWarshipCollection(ILogger<FormWarshipCollection> logger)
    {
        InitializeComponent();
        _storageCollection = new();
+        _logger = logger;
    }

    /// <summary>
@@ -45,7 +53,6 @@ public partial class FormWarshipCollection : Form
    private void ButtonAddWarship_Click(object sender, EventArgs e)
    {
        FormWarshipConfig form = new();
-        // TODO передать метод +
        form.AddEvent(SetWarship);
        form.Show();
    }
@@ -60,15 +67,28 @@ public partial class FormWarshipCollection : Form
        {
            return;
        }
-
-        if (_company + warship != -1)
+        try
        {
-            MessageBox.Show("Объект добавлен");
-            pictureBox.Image = _company.Show();
+            if (_company + warship != -1)
+            {
+                MessageBox.Show("Объект добавлен");
+                _logger.LogInformation($"Добавлен объект {warship.GetDataForSave()}");
+                pictureBox.Image = _company.Show();
+            }
+            else
+            {
+                MessageBox.Show("Не удалось добавить объект");
+            }
        }
-        else
+        catch (CollectionOverflowException ex)
        {
-            MessageBox.Show("Не удалось добавить объект");
+            MessageBox.Show(ex.Message);
+            _logger.LogWarning($"Ошибка: {ex.Message}");
+        }
+        catch (ArgumentException ex)
+        {
+            MessageBox.Show(ex.Message);
+            _logger.LogWarning($"Ошибка: {ex.Message}");
        }
    }

@@ -89,16 +109,27 @@ public partial class FormWarshipCollection : Form
            return;
        }

-        int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-        if (_company - pos != null)
+        try
        {
-            MessageBox.Show("Объект удален");
-            pictureBox.Image = _company.Show();
+            int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
+            if (_company - pos != null)
+            {
+                MessageBox.Show("Объект удален");
+                _logger.LogInformation($"Удален объект по позиции {pos}");
+                pictureBox.Image = _company.Show();
+            }
        }
-        else
+        catch (ObjectNotFoundException ex)
        {
-            MessageBox.Show("Не удалось удалить объект");
+            MessageBox.Show(ex.Message);
+            _logger.LogError($"Ошибка: {ex.Message}");
        }
+        catch (PositionOutOfCollectionException ex)
+        {
+            MessageBox.Show(ex.Message);
+            _logger.LogError($"Ошибка: {ex.Message}");
+        }
+
    }

    /// <summary>
@@ -162,6 +193,7 @@ public partial class FormWarshipCollection : Form
        if (string.IsNullOrEmpty(textBoxCollectionName.Text) || (!radioButtonList.Checked && !radioButtonMassive.Checked))
        {
            MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            _logger.LogError("Ошибка: Заполнены не все данные для добавления коллекции");
            return;
        }

@@ -174,8 +206,10 @@ public partial class FormWarshipCollection : Form
        {
            collectionType = CollectionType.List;
        }
+        CollectionInfo collectionInfo = new CollectionInfo(textBoxCollectionName.Text, collectionType, string.Empty);

-        _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
+        _storageCollection.AddCollection(collectionInfo);
+        _logger.LogInformation($"Добавлена коллекция: {textBoxCollectionName.Text} типа: {collectionType}");
        RerfreshListBoxItems();
    }

@@ -196,7 +230,10 @@ public partial class FormWarshipCollection : Form
        {
            return;
        }
-        _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
+
+        CollectionInfo collectionInfo = new CollectionInfo(listBoxCollection.SelectedItem.ToString(), CollectionType.None, string.Empty);
+        _storageCollection.DelCollection(collectionInfo);
+        _logger.LogInformation($"Удалена коллекция: {listBoxCollection.SelectedItem.ToString()}");
        RerfreshListBoxItems();
    }

@@ -208,7 +245,7 @@ public partial class FormWarshipCollection : Form
        listBoxCollection.Items.Clear();
        for (int i = 0; i < _storageCollection.Keys?.Count; ++i)
        {
-            string? colName = _storageCollection.Keys?[i];
+            string? colName = _storageCollection.Keys?[i].Name;
            if (!string.IsNullOrEmpty(colName))
            {
                listBoxCollection.Items.Add(colName);
@@ -229,7 +266,8 @@ public partial class FormWarshipCollection : Form
            return;
        }

-        ICollectionGenericObjects<DrawningWarship>? collection = _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
+        CollectionInfo collectionInfo = new CollectionInfo(listBoxCollection.SelectedItem.ToString(), CollectionType.None, string.Empty);
+        ICollectionGenericObjects<DrawningWarship>? collection = _storageCollection[collectionInfo];
        if (collection == null)
        {
            MessageBox.Show("Коллекция не проинициализирована");
@@ -245,4 +283,85 @@ public partial class FormWarshipCollection : Form
        panelCompanyTools.Enabled = true;
        RerfreshListBoxItems();
    }
-}
+
+    /// <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(ex.Message, "Результат", 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);
+                MessageBox.Show("Загрузка прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                RerfreshListBoxItems();
+                _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)
+    {
+        CompareWarships(new DrawningWarshipCompareByType());
+    }
+
+    /// <summary>
+    /// Сортировка по цвету
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonSortByColor_Click(object sender, EventArgs e)
+    {
+        CompareWarships(new DrawningWarshipCompareByColor());
+    }
+
+    /// <summary>
+    /// Сортировка по сравнителю
+    /// </summary>
+    /// <param name="comparer">Сравнитель объектов</param>
+    private void CompareWarships(IComparer<DrawningWarship?> comparer)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+        _company.Sort(comparer);
+        pictureBox.Image = _company.Show();
+    }
+}
--- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormWarshipCollection.resx
+++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormWarshipCollection.resx
@@ -117,4 +117,13 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
+  <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>183, 17</value>
+  </metadata>
+  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>398, 17</value>
+  </metadata>
 </root>
--- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Program.cs
+++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Program.cs
@@ -1,3 +1,8 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.DependencyInjection;
+using Serilog;
+
 namespace ProjectAircraftCarrier_
 {
    internal static class Program
@@ -11,7 +16,31 @@ namespace ProjectAircraftCarrier_
            // To customize application configuration such as set high DPI settings or default font,
            // see https://aka.ms/applicationconfiguration.
            ApplicationConfiguration.Initialize();
-            Application.Run(new FormWarshipCollection());
+
+            ServiceCollection services = new();
+            ConfigureServices(services);
+            using ServiceProvider serviceProvider = services.BuildServiceProvider();
+            Application.Run(serviceProvider.GetRequiredService<FormWarshipCollection>());
+        }
+
+        /// <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<FormWarshipCollection>()
+                .AddLogging(option =>
+                {
+                    option.SetMinimumLevel(LogLevel.Information);
+                    var config = new ConfigurationBuilder()
+                        .AddJsonFile("serilogConfig.json", optional: false, reloadOnChange: true)
+                        .Build();
+                    option.AddSerilog(Log.Logger = new LoggerConfiguration()
+                        .ReadFrom.Configuration(config)
+                        .CreateLogger());
+                });
        }
    }
 }
--- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/ProjectAircraftCarrier_.csproj
+++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/ProjectAircraftCarrier_.csproj
@@ -8,6 +8,18 @@
    <ImplicitUsings>enable</ImplicitUsings>
  </PropertyGroup>

+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Serilog" Version="3.1.1" />
+    <PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+  </ItemGroup>
+
  <ItemGroup>
    <Compile Update="Properties\Resources.Designer.cs">
      <DesignTime>True</DesignTime>
@@ -23,4 +35,10 @@
    </EmbeddedResource>
  </ItemGroup>

+  <ItemGroup>
+    <None Update="serilogConfig.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>
--- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/WarshipDelegate.cs
+++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/WarshipDelegate.cs
@@ -1,9 +0,0 @@
-using ProjectAircraftCarrier_.Drawnings;
-
-namespace ProjectAircraftCarrier_;
-
-/// <summary>
-/// Делегат передачи объекта класса-прорисовки
-/// </summary>
-/// <param name="warship"></param>
-public delegate void WarshipDelegate(DrawningWarship warship);
--- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/serilogConfig.json
+++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/serilogConfig.json
@@ -0,0 +1,25 @@
+{
+  "AllowedHosts": "*",
+  "Serilog": {
+    "Using": [ "Serilog.Sinks.File", "Serilog.Sinks.Console" ],
+    "MinimumLevel": {
+      "Default": "Information",
+      "Override": {
+        "Microsoft": "Warning",
+        "System": "Warning"
+      }
+    },
+    "Enrich": [ "FromLogContext", "WithMachineName", "WithProcessId", "WithThreadId" ],
+    "WriteTo": [
+      { "Name": "Console" },
+      {
+        "Name": "File",
+        "Args": {
+          "path": "C:\\Users\\Андрей\\OneDrive\\Рабочий стол\\уник\\ООП\\log.txt",
+          "rollingInterval": "Day",
+          "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss.ffff} | {Level:u} | {SourceContext} | {Message:1j}{NewLine}{Exception}"
+        }
+      }
+    ]
+  }
+}
Author	SHA1	Message	Date
sheymuh	b3effcc182	Лабораторная работа №8	2024-05-13 23:55:26 +04:00
sheymuh	d4ee137ca9	Добавил вывод ошибок в форме	2024-05-01 15:22:01 +04:00
sheymuh	9ddfd8be3e	Лабораторная работа №7	2024-05-01 15:16:31 +04:00
sheymuh	2025901f29	Доделаны требования	2024-04-26 13:29:17 +04:00
sheymuh	98d97e8199	Лабораторная работа №6	2024-04-22 16:04:23 +04:00
sheymuh	1628457ece	Добавление расширения для класса-сущности	2024-04-20 08:44:17 +04:00