последний вариант

не до конца
2024-04-04 09:42:34 +04:00 · 2024-04-03 16:04:24 +04:00 · 2024-04-03 15:57:29 +04:00 · 2024-04-01 01:18:15 +04:00 · 2024-03-30 05:03:10 +04:00 · 2024-03-26 00:09:01 +04:00
27 changed files with 306 additions and 883 deletions
--- a/AirFighter/AirFighter/CollectionGenericObjects/AbstractCompany.cs
+++ b/AirFighter/AirFighter/CollectionGenericObjects/AbstractCompany.cs
@@ -1,10 +1,9 @@
 using ProjectAirFighter.Drawnings;
-using ProjectAirFighter.Exceptions;

 namespace ProjectAirFighter.CollectionGenericObjects;

 /// <summary>
-/// Абстракция компании, хранящий коллекцию военных самолётов
+/// Абстракция компании, хранящий коллекцию автомобилей
 /// </summary>
 public abstract class AbstractCompany
 {
@@ -29,7 +28,7 @@ public abstract class AbstractCompany
    protected readonly int _pictureHeight;

    /// <summary>
-    /// Коллекция военных самолётов
+    /// Коллекция автомобилей
    /// </summary>
    protected ICollectionGenericObjects<DrawningMilitaryAircraft>? _collection = null;

@@ -43,13 +42,13 @@ public abstract class AbstractCompany
    /// </summary>
    /// <param name="picWidth">Ширина окна</param>
    /// <param name="picHeight">Высота окна</param>
-    /// <param name="collection">Коллекция военных самолётов</param>
+    /// <param name="collection">Коллекция автомобилей</param>
    public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects<DrawningMilitaryAircraft> collection)
    {
        _pictureWidth = picWidth;
        _pictureHeight = picHeight;
        _collection = collection;
-        _collection.MaxCount = GetMaxCount;
+        _collection.SetMaxCount = GetMaxCount;
    }

    /// <summary>
@@ -96,18 +95,9 @@ 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;
--- a/AirFighter/AirFighter/CollectionGenericObjects/Angar.cs
+++ b/AirFighter/AirFighter/CollectionGenericObjects/Angar.cs
@@ -1,10 +1,9 @@
 using ProjectAirFighter.Drawnings;
-using ProjectAirFighter.Exceptions;

 namespace ProjectAirFighter.CollectionGenericObjects;

 /// <summary>
-/// Реализация абстрактной компании - ангар
+/// Реализация абстрактной компании - каршеринг 
 /// </summary>
 public class Angar : AbstractCompany
 {
@@ -43,13 +42,11 @@ public class Angar : AbstractCompany

        for (int i = 0; i < (_collection?.Count ?? 0); i++)
        {
-            try
+            if (_collection.Get(i) != null)
            {
                _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--;
@@ -58,7 +55,7 @@ public class Angar : AbstractCompany
                curWidth = width - 1;
                curHeight--;
            }
-            if (curHeight >= height)
+            if (curHeight > height)
            {
                return;
            }
--- a/AirFighter/AirFighter/CollectionGenericObjects/ICollectionGenericObjects.cs
+++ b/AirFighter/AirFighter/CollectionGenericObjects/ICollectionGenericObjects.cs
@@ -1,6 +1,4 @@
-using ProjectAirFighter.Drawnings;
-
-namespace ProjectAirFighter.CollectionGenericObjects;
+namespace ProjectAirFighter.CollectionGenericObjects;

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

    /// <summary>
    /// Добавление объекта в коллекцию
@@ -47,15 +45,4 @@ public interface ICollectionGenericObjects<T>
    /// <param name="position">Позиция</param>
    /// <returns>Объект</returns>
    T? Get(int position);
-
-    /// <summary>
-	/// Получение типа коллекции
-	/// </summary>
-	CollectionType GetCollectionType { get; }
-
-    /// <summary>
-    /// Получение объектов коллекции по одному
-    /// </summary>
-    /// <returns>Поэлементый вывод элементов коллекции</returns>
-    IEnumerable<T?> GetItems();
 }
--- a/AirFighter/AirFighter/CollectionGenericObjects/ListGenericObjects.cs
+++ b/AirFighter/AirFighter/CollectionGenericObjects/ListGenericObjects.cs
@@ -1,6 +1,4 @@
-using ProjectAirFighter.Exceptions;
-
-namespace ProjectAirFighter.CollectionGenericObjects;
+namespace ProjectAirFighter.CollectionGenericObjects;

 /// <summary>
 /// Параметризованный набор объектов
@@ -21,22 +19,7 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>

    public int Count => _collection.Count;

-    public int MaxCount
-    {
-        get
-        {
-            return Count;
-        }
-        set
-        {
-            if (value > 0)
-            {
-                _maxCount = value;
-            }
-        }
-    }
-
-    public CollectionType GetCollectionType => CollectionType.List;
+    public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } }

    /// <summary>
    /// Конструктор
@@ -48,38 +31,38 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>

    public T? Get(int position)
    {
-        if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position);
+        // TODO проверка позиции
+        if (position >= Count || position < 0) return null;
        return _collection[position];
    }

    public int Insert(T obj)
    {
-        if (Count == _maxCount) throw new CollectionOverflowException(Count);
+        // TODO проверка, что не превышено максимальное количество элементов
+        // TODO вставка в конец набора
+        if (Count + 1 > _maxCount) return -1;
        _collection.Add(obj);
        return Count;
    }

    public int Insert(T obj, int position)
    {
-        if (Count == _maxCount) throw new CollectionOverflowException(Count);
-        if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position);
+        // TODO проверка, что не превышено максимальное количество элементов
+        // TODO проверка позиции
+        // TODO вставка по позиции
+        if (Count + 1 > _maxCount) return -1;
+        if (position < 0 || position > Count) return -1;
        _collection.Insert(position, obj);
-        return position;
+        return 1;
    }

    public T? Remove(int position)
    {
-        if (position >= _collection.Count || position < 0) throw new PositionOutOfCollectionException(position);
-        T obj = _collection[position];
+        // TODO проверка позиции
+        // TODO удаление объекта из списка
+        if (position < 0 || position > Count) return null;
+        T? pos = _collection[position];
        _collection.RemoveAt(position);
-        return obj;
-    }
-
-    public IEnumerable<T?> GetItems()
-    {
-        for (int i = 0; i < Count; ++i)
-        {
-            yield return _collection[i];
-        }
+        return pos;
    }
 }
--- a/AirFighter/AirFighter/CollectionGenericObjects/MassiveGenericObjects.cs
+++ b/AirFighter/AirFighter/CollectionGenericObjects/MassiveGenericObjects.cs
@@ -1,6 +1,4 @@
-using ProjectAirFighter.Exceptions;
-
-namespace ProjectAirFighter.CollectionGenericObjects;
+namespace ProjectAirFighter.CollectionGenericObjects;

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

    public int Count => _collection.Length;

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

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

    public T? Get(int position)
    {
-        if (position < 0 || position >= Count - 3) throw new PositionOutOfCollectionException(position);
-        if (_collection[position] == null) throw new ObjectNotFoundException(position);
+        // TODO проверка позиции
+        if (position >= _collection.Length || position < 0)
+        { return null; }
        return _collection[position];
    }

    public int Insert(T obj)
    {
-        for (int i = 0; i < Count - 3; i++)
+        // TODO вставка в свободное место набора
+        int index = 0;
+        while (index < _collection.Length)
        {
-            if (_collection[i] == null)
+            if (_collection[index] == null)
            {
-                _collection[i] = obj;
-                return i;
+                _collection[index] = obj;
+                return index;
            }
+
+            index++;
        }
-        throw new CollectionOverflowException(Count);
+        return -1;
    }

    public int Insert(T obj, int position)
    {
-        if (position < 0 || position >= Count - 3) throw new PositionOutOfCollectionException(position);
+        // TODO проверка позиции
+        // TODO проверка, что элемент массива по этой позиции пустой, если нет, то
+        //		ищется свободное место после этой позиции и идет вставка туда
+        //		если нет после, ищем до
+        // TODO вставка
+        if (position >= _collection.Length || position < 0)
+        { return -1; }

-        if (_collection[position] != null)
+        if (_collection[position] == null)
        {
-            bool pushed = false;
-            for (int index = position + 1; index < Count; index++)
-            {
-                if (_collection[index] == null)
-                {
-                    position = index;
-                    pushed = true;
-                    break;
-                }
-            }
+            _collection[position] = obj;
+            return position;
+        }
+        int index;

-            if (!pushed)
+        for (index = position + 1; index < _collection.Length; ++index)
+        {
+            if (_collection[index] == null)
            {
-                for (int index = position - 1; index >= 0; index--)
-                {
-                    if (_collection[index] == null)
-                    {
-                        position = index;
-                        pushed = true;
-                        break;
-                    }
-                }
-            }
-
-            if (!pushed)
-            {
-                throw new CollectionOverflowException(Count);
+                _collection[position] = obj;
+                return position;
            }
        }

-        // вставка
-        _collection[position] = obj;
-        return position;
+        for (index = position - 1; index >= 0; --index)
+        {
+            if (_collection[index] == null)
+            {
+                _collection[position] = obj;
+                return position;
+            }
+        }
+        return -1;
    }

    public T? Remove(int position)
    {
-        if (position >= Count - 3 || position < 0) throw new PositionOutOfCollectionException(position);
-        if (_collection[position] == null) throw new ObjectNotFoundException(position);
+        // TODO проверка позиции
+        // TODO удаление объекта из массива, присвоив элементу массива значение null
+        if (position >= _collection.Length || position < 0)
+        { 
+            return null; 
+        }
        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];
-        }
-    }
 }
--- a/AirFighter/AirFighter/CollectionGenericObjects/StorageCollection.cs
+++ b/AirFighter/AirFighter/CollectionGenericObjects/StorageCollection.cs
@@ -1,15 +1,11 @@
-using ProjectAirFighter.Drawnings;
-using ProjectAirFighter.Exceptions;
-using System.Text;
-
-namespace ProjectAirFighter.CollectionGenericObjects;
+namespace ProjectAirFighter.CollectionGenericObjects;

 /// <summary>
 /// Класс-хранилище коллекций
 /// </summary>
 /// <typeparam name="T"></typeparam>
 public class StorageCollection<T>
-    where T : DrawningMilitaryAircraft
+    where T : class
 {
    /// <summary>
    /// Словарь (хранилище) с коллекциями
@@ -21,26 +17,12 @@ public class StorageCollection<T>
    /// </summary>
    public List<string> Keys => _storages.Keys.ToList();

-    /// Ключевое слово, с которого должен начинаться файл
-    /// </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<string, ICollectionGenericObjects<T>>();
    }

    /// <summary>
@@ -50,6 +32,8 @@ public class StorageCollection<T>
    /// <param name="collectionType">тип коллекции</param>
    public void AddCollection(string name, CollectionType collectionType)
    {
+        // TODO проверка, что name не пустой и нет в словаре записи с таким ключом
+        // TODO Прописать логику для добавления
        if (name == null || _storages.ContainsKey(name)) { return; }
        switch (collectionType)

@@ -71,6 +55,7 @@ public class StorageCollection<T>
    /// <param name="name">Название коллекции</param>
    public void DelCollection(string name)
    {
+        // TODO Прописать логику для удаления коллекции
        if (_storages.ContainsKey(name))
            _storages.Remove(name);
    }
@@ -84,152 +69,9 @@ public class StorageCollection<T>
    {
        get
        {
+            // TODO Продумать логику получения объекта
            if (name == null || !_storages.ContainsKey(name)) { return null; }
            return _storages[name];
        }
    }
-
-    /// <summary>
-    /// Сохранение информации по военным самолётам в хранилище в файл
-    /// </summary>
-    /// <param name="filename">Путь и имя файла</param>
-    /// <returns>true - сохранение прошло успешно, false - ошибка при сохранении данных</returns>
-
-    public void SaveData(string filename)
-    {
-        if (_storages.Count == 0)
-        {
-            throw new InvalidOperationException("В хранилище отсутствуют коллекции для сохранения");
-        }
-
-        if (File.Exists(filename))
-        {
-            File.Delete(filename);
-        }
-
-        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;
-                }
-
-                sb.Append(value.Key);
-                sb.Append(_separatorForKeyValue);
-                sb.Append(value.Value.GetCollectionType);
-                sb.Append(_separatorForKeyValue);
-                sb.Append(value.Value.MaxCount);
-                sb.Append(_separatorForKeyValue);
-
-                foreach (T? item in value.Value.GetItems())
-                {
-                    string data = item?.GetDataForSave() ?? string.Empty;
-
-                    if (string.IsNullOrEmpty(data))
-                    {
-                        continue;
-                    }
-                    sb.Append(data);
-                    sb.Append(_separatorItems);
-                }
-                writer.Write(sb);
-            }
-        }
-    }
-
-    /// <summary>
-    /// Загрузка информации по военным самолётам в хранилище из файла
-    /// </summary>
-    /// <param name="filename">Путь и имя файла</param>
-    /// <returns>true - загрузка прошла успешно, false - ошибка при загрузке данных</returns>
-    public void LoadData(string filename)
-    {
-        if (!File.Exists(filename))
-        {
-            throw new FileNotFoundException("Файл не существует");
-        }
-        using (StreamReader fs = File.OpenText(filename))
-        {
-            string str = fs.ReadLine();
-
-            if (str == null || str.Length == 0)
-            {
-                throw new FormatException("В файле неверные данные");
-            }
-
-            if (!str.StartsWith(_collectionKey))
-            {
-                throw new FormatException("В файле неверные данные");
-            }
-
-            _storages.Clear();
-
-            string strs = "";
-
-            while ((strs = fs.ReadLine()) != null)
-            {
-                string[] record = strs.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
-
-                if (record.Length != 4)
-                {
-                    continue;
-                }
-
-                CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]);
-                ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionType);
-
-                if (collection == null)
-                {
-                    throw new InvalidOperationException("Не удалось определить тип коллекции:" + record[1]);
-                }
-
-                collection.MaxCount = Convert.ToInt32(record[2]);
-
-                string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
-
-                foreach (string elem in set)
-                {
-                    if (elem?.CreateDrawningMilitaryAircraft() is T militaryAircraft)
-                    {
-                        try
-                        {
-                            if (collection.Insert(militaryAircraft) == -1)
-                            {
-                                throw new InvalidOperationException("Объект не удалось добавить в коллекцию: " + record[3]);
-                            }
-                        }
-                        catch (CollectionOverflowException ex)
-                        {
-                            throw new CollectionOverflowException("Коллекция переполнена", ex);
-                        }
-                    }
-                }
-                _storages.Add(record[0], 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/AirFighter/AirFighter/Drawnings/DrawningAirFighter.cs
+++ b/AirFighter/AirFighter/Drawnings/DrawningAirFighter.cs
@@ -17,40 +17,24 @@ public class DrawningAirFighter : DrawningMilitaryAircraft
    /// <param name="additionalColor">Дополнительный цвет</param>
    /// <param name="wings">Признак наличия доп крыльев</param>
    /// <param name="rockets">Признак наличия ракет</param>
-    public DrawningAirFighter(int speed, double weight, Color bodyColor, Color additionalColor, bool wings, bool rockets) : base(70, 70)
+    public DrawningAirFighter (int speed, double weight, Color bodyColor, Color additionalColor, bool wings, bool rockets) : base (70, 70)
    {
        EntityMilitaryAircraft = new EntityAirFighter(speed, weight, bodyColor, additionalColor, wings, rockets);
    }

-    /// <summary>
-    /// Конструктор
-    /// </summary>
-    public DrawningAirFighter(EntityAirFighter militaryAircraft) : base(110, 60)
-    {
-        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)
+        if (EntityMilitaryAircraft == null || EntityMilitaryAircraft is not EntityAirFighter militaryAircraftFighter || !_startPosX.HasValue || !_startPosY.HasValue)
        {
            return;
        }

        Pen pen = new(Color.Black);
-        Brush additionalBrush = new SolidBrush(airFighter.AdditionalColor);
+        Brush additionalBrush = new SolidBrush(militaryAircraftFighter.AdditionalColor);

        base.DrawTransport(g);

-        if (airFighter.Wings)
+        if (militaryAircraftFighter.Wings)
        {
            Point wings1 = new Point(_startPosX.Value + 45, _startPosY.Value + 30);
            Point wings2 = new Point(_startPosX.Value + 45, _startPosY.Value + 15);
@@ -69,7 +53,7 @@ public class DrawningAirFighter : DrawningMilitaryAircraft
            g.DrawPolygon(pen, DownWing);
        }

-        if (airFighter.Rockets)
+        if (militaryAircraftFighter.Rockets)
        {
            Point rocket1 = new Point(_startPosX.Value + 40, _startPosY.Value + 5);
            Point rocket2 = new Point(_startPosX.Value + 15, _startPosY.Value + 5);
--- a/AirFighter/AirFighter/Drawnings/DrawningMilitaryAircraft.cs
+++ b/AirFighter/AirFighter/Drawnings/DrawningMilitaryAircraft.cs
@@ -23,22 +23,22 @@ public class DrawningMilitaryAircraft
    private int? _pictureHeight;

    /// <summary>
-	/// Левая координата прорисовки  самолёта
+	/// Левая координата прорисовки самолёта
 	/// </summary>
    protected int? _startPosX;

    /// <summary>
-	/// Верхняя кооридната прорисовки военного самолёта
+	/// Верхняя кооридната прорисовки самолёта
 	/// </summary>
    protected int? _startPosY;

    /// <summary>
-	/// Ширина прорисовки военного самолёта
+	/// Ширина прорисовки самолёта
 	/// </summary>
    private readonly int _drawningMilitaryAircraftWidth = 70;

    /// <summary>
-	/// Высота прорисовки военного самолёта
+	/// Высота прорисовки самолёта
 	/// </summary>
    private readonly int _drawningMilitaryAircraftHeight = 70;

@@ -79,26 +79,17 @@ public class DrawningMilitaryAircraft
 	/// <param name="speed">Скорость</param>
 	/// <param name="weight">Вес</param>
 	/// <param name="bodyColor">Основной цвет</param>
-    public DrawningMilitaryAircraft(int speed, double weight, Color bodyColor) : this()
+    public DrawningMilitaryAircraft (int speed, double weight, Color bodyColor) : this()
    {
        EntityMilitaryAircraft = new EntityMilitaryAircraft(speed, weight, bodyColor);
    }

-    /// <summary>
-    /// Конструктор
-    /// </summary>
-    /// <param name="militaryAircraft">Класс-сущность</param>
-    public DrawningMilitaryAircraft(EntityMilitaryAircraft militaryAircraft) : this()
-    {
-        EntityMilitaryAircraft = militaryAircraft;
-    }
-
    /// <summary>
 	/// Конструктор для наследников
 	/// </summary>
-	/// <param name="drawningCarWidth">Ширина прорисовки военного самолёта</param>
-	/// <param name="drawningCarHeight">Высота прорисовки военного самолёта</param>
-    protected DrawningMilitaryAircraft(int drawningMilitaryAircraftWidth, int drawningMilitaryAircraftHeight) : this()
+	/// <param name="drawningCarWidth">Ширина прорисовки самолёта</param>
+	/// <param name="drawningCarHeight">Высота прорисовки самолёта</param>
+    protected DrawningMilitaryAircraft(int drawningMilitaryAircraftWidth, int drawningMilitaryAircraftHeight) : this() 
    {
        _drawningMilitaryAircraftWidth = drawningMilitaryAircraftWidth;
        _drawningMilitaryAircraftHeight = drawningMilitaryAircraftHeight;
--- a/AirFighter/AirFighter/Drawnings/ExtentionDrawningMilitaryAircraft.cs
+++ b/AirFighter/AirFighter/Drawnings/ExtentionDrawningMilitaryAircraft.cs
@@ -1,54 +0,0 @@
-using ProjectAirFighter.Entities;
-
-namespace ProjectAirFighter.Drawnings;
-
-/// <summary>
-/// Расширение для класса EntityCar
-/// </summary>
-public static class ExtentionDrawningMilitaryAircraft
-{
-    /// <summary>
-    /// Разделитель для записи информации по объекту в файл
-    /// </summary>
-    private static readonly string _separatorForObject = ":";
-
-    /// <summary>
-    /// Создание объекта из строки
-    /// </summary>
-    /// <param name="info">Строка с данными для создания объекта</param>
-    /// <returns>Объект</returns>
-    public static DrawningMilitaryAircraft? CreateDrawningMilitaryAircraft(this string info)
-    {
-        string[] strs = info.Split(_separatorForObject);
-        EntityMilitaryAircraft? militaryAircraft = EntityAirFighter.CreateEntityAirFighter(strs);
-        if (militaryAircraft != null)
-        {
-            return new DrawningAirFighter((EntityAirFighter)militaryAircraft);
-        }
-
-        militaryAircraft = EntityMilitaryAircraft.CreateEntityMilitaryAircraft(strs);
-        if (militaryAircraft != null)
-        {
-            return new DrawningMilitaryAircraft(militaryAircraft);
-        }
-
-        return null;
-    }
-
-    /// <summary>
-    /// Получение данных для сохранения в файл
-    /// </summary>
-    /// <param name="drawningCar">Сохраняемый объект</param>
-    /// <returns>Строка с данными по объекту</returns>
-    public static string GetDataForSave(this DrawningMilitaryAircraft drawningMilitaryAircraft)
-    {
-        string[]? array = drawningMilitaryAircraft?.EntityMilitaryAircraft?.GetStringRepresentation();
-
-        if (array == null)
-        {
-            return string.Empty;
-        }
-
-        return string.Join(_separatorForObject, array);
-    }
-}
--- a/AirFighter/AirFighter/Entities/EntityAirFighter.cs
+++ b/AirFighter/AirFighter/Entities/EntityAirFighter.cs
@@ -22,24 +22,4 @@ public class EntityAirFighter : EntityMilitaryAircraft
        Rockets = rockets;
        Wings = wings;
    }
-
-    public override string[] GetStringRepresentation()
-    {
-        return new[] { nameof(EntityAirFighter), Speed.ToString(), Weight.ToString(), BodyColor.Name, Wings.ToString(), Rockets.ToString(), AdditionalColor.Name };
-    }
-
-    /// <summary>
-    /// Создание объекта из массива строк
-    /// </summary>
-    /// <param name="strs"></param>
-    /// <returns></returns>
-    public static EntityAirFighter? CreateEntityAirFighter(string[] strs)
-    {
-        if (strs.Length != 8 || strs[0] != nameof(EntityAirFighter))
-        {
-            return null;
-        }
-
-        return new EntityAirFighter(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]), Color.FromName(strs[4]), Convert.ToBoolean(strs[5]), Convert.ToBoolean(strs[6]));
-    }
 }
--- a/AirFighter/AirFighter/Entities/EntityMilitaryAircraft.cs
+++ b/AirFighter/AirFighter/Entities/EntityMilitaryAircraft.cs
@@ -1,7 +1,7 @@
 namespace ProjectAirFighter.Entities;

 /// <summary>
-/// Класс-сущность "Военный самолёт"
+/// Класс-сущность "Истребитель"
 /// </summary>
 public class EntityMilitaryAircraft
 {
@@ -25,34 +25,10 @@ public class EntityMilitaryAircraft
 	/// <param name="weight">Вес автомобиля</param>
 	/// <param name="bodyColor">Основной цвет</param>

-    public EntityMilitaryAircraft(int speed, double weight, Color bodyColor)
+    public EntityMilitaryAircraft (int speed, double weight, Color bodyColor)
    {
        Speed = speed;
        Weight = weight;
        BodyColor = bodyColor;
    }
-
-    /// <summary>
-    /// Получение строк со значениями свойств объекта класса-сущности
-    /// </summary>
-    /// <returns></returns>
-    public virtual string[] GetStringRepresentation()
-    {
-        return new[] { nameof(EntityMilitaryAircraft), Speed.ToString(), Weight.ToString(), BodyColor.Name };
-    }
-
-    /// <summary>
-    /// Создание объекта из массива строк
-    /// </summary>
-    /// <param name="strs"></param>
-    /// <returns></returns>
-    public static EntityMilitaryAircraft? CreateEntityMilitaryAircraft(string[] strs)
-    {
-        if (strs.Length != 4 || strs[0] != nameof(EntityMilitaryAircraft))
-        {
-            return null;
-        }
-
-        return new EntityMilitaryAircraft(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]));
-    }
 }
--- a/AirFighter/AirFighter/Exceptions/CollectionOverflowException.cs
+++ b/AirFighter/AirFighter/Exceptions/CollectionOverflowException.cs
@@ -1,20 +0,0 @@
-using System.Runtime.Serialization;
-
-namespace ProjectAirFighter.Exceptions;
-
-/// <summary>
-/// Класс, описывающий ошибку переполнения коллекции
-/// </summary>
-[Serializable]
-public class CollectionOverflowException : ApplicationException
-{
-    public CollectionOverflowException(int count) : base("В коллекции превышено допустимое количество: " + count) { }
-
-    public CollectionOverflowException() : base() { }
-
-    public CollectionOverflowException(string message) : base(message) { }
-
-    public CollectionOverflowException(string message, Exception exception) : base(message, exception) { }
-
-    protected CollectionOverflowException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
-}
--- a/AirFighter/AirFighter/Exceptions/ObjectNotFoundException.cs
+++ b/AirFighter/AirFighter/Exceptions/ObjectNotFoundException.cs
@@ -1,20 +0,0 @@
-using System.Runtime.Serialization;
-
-namespace ProjectAirFighter.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/AirFighter/AirFighter/Exceptions/PositionOutOfCollectionException.cs
+++ b/AirFighter/AirFighter/Exceptions/PositionOutOfCollectionException.cs
@@ -1,20 +0,0 @@
-using System.Runtime.Serialization;
-
-namespace ProjectAirFighter.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/AirFighter/AirFighter/FormAirFighter.resx
+++ b/AirFighter/AirFighter/FormAirFighter.resx
@@ -28,7 +28,7 @@
    </data>

    There are any number of "resheader" rows that contain simple
-    name/value pairs.
+    name/value pmilitaryAircrafts.

    Each data row contains a name, and value. The row also contains a
    type or mimetype. Type corresponds to a .NET class that support
--- a/AirFighter/AirFighter/FormMilitaryAircraftCollection.Designer.cs
+++ b/AirFighter/AirFighter/FormMilitaryAircraftCollection.Designer.cs
@@ -28,151 +28,61 @@
        /// </summary>
        private void InitializeComponent()
        {
-            groupBoxTools = new GroupBox();
-            panelCompanyTools = new Panel();
-            buttonRefresh = new Button();
-            buttonGoToCheck = new Button();
-            buttonRemoveMilitaryAircraft = new Button();
-            buttonAddMilitaryAircraft = new Button();
-            maskedTextBoxPosition = new MaskedTextBox();
-            buttonCreateCompany = new Button();
+            pictureBox = new PictureBox();
            panelStorage = new Panel();
            buttonCollectionDel = new Button();
            listBoxCollection = new ListBox();
            buttonCollectionAdd = new Button();
-            textBoxCollectionName = new TextBox();
-            radioButtonMassive = new RadioButton();
            radioButtonList = new RadioButton();
+            radioButtonMassive = new RadioButton();
+            textBoxCollectionName = new TextBox();
            labelCollectionName = new Label();
            comboBoxSelectorCompany = new ComboBox();
-            pictureBox = new PictureBox();
-            menuStrip = new MenuStrip();
-            файлToolStripMenuItem = new ToolStripMenuItem();
-            saveToolStripMenuItem = new ToolStripMenuItem();
-            loadToolStripMenuItem = new ToolStripMenuItem();
-            saveFileDialog = new SaveFileDialog();
-            openFileDialog = new OpenFileDialog();
-            groupBoxTools.SuspendLayout();
-            panelCompanyTools.SuspendLayout();
-            panelStorage.SuspendLayout();
+            panelCompanyTools = new Panel();
+            buttonRefresh = new Button();
+            buttonAddMilitaryAircraft = new Button();
+            buttonGoToCheck = new Button();
+            buttonRemoveAir = new Button();
+            maskedTextBoxPosition = new MaskedTextBox();
+            buttonCreateCompany = new Button();
+            groupBoxTools = new GroupBox();
            ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
-            menuStrip.SuspendLayout();
+            panelStorage.SuspendLayout();
+            panelCompanyTools.SuspendLayout();
+            groupBoxTools.SuspendLayout();
            SuspendLayout();
            // 
-            // groupBoxTools
+            // pictureBox
            // 
-            groupBoxTools.Controls.Add(panelCompanyTools);
-            groupBoxTools.Controls.Add(buttonCreateCompany);
-            groupBoxTools.Controls.Add(panelStorage);
-            groupBoxTools.Controls.Add(comboBoxSelectorCompany);
-            groupBoxTools.Dock = DockStyle.Right;
-            groupBoxTools.Location = new Point(744, 28);
-            groupBoxTools.Name = "groupBoxTools";
-            groupBoxTools.Size = new Size(206, 639);
-            groupBoxTools.TabIndex = 0;
-            groupBoxTools.TabStop = false;
-            groupBoxTools.Text = "Инструменты";
-            // 
-            // panelCompanyTools
-            // 
-            panelCompanyTools.Controls.Add(buttonRefresh);
-            panelCompanyTools.Controls.Add(buttonGoToCheck);
-            panelCompanyTools.Controls.Add(buttonRemoveMilitaryAircraft);
-            panelCompanyTools.Controls.Add(buttonAddMilitaryAircraft);
-            panelCompanyTools.Controls.Add(maskedTextBoxPosition);
-            panelCompanyTools.Dock = DockStyle.Bottom;
-            panelCompanyTools.Enabled = false;
-            panelCompanyTools.Location = new Point(3, 357);
-            panelCompanyTools.Name = "panelCompanyTools";
-            panelCompanyTools.Size = new Size(200, 279);
-            panelCompanyTools.TabIndex = 10;
-            // 
-            // buttonRefresh
-            // 
-            buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRefresh.Location = new Point(0, 227);
-            buttonRefresh.Name = "buttonRefresh";
-            buttonRefresh.Size = new Size(192, 49);
-            buttonRefresh.TabIndex = 7;
-            buttonRefresh.Text = "Обновить";
-            buttonRefresh.UseVisualStyleBackColor = true;
-            buttonRefresh.Click += buttonRefresh_Click;
-            // 
-            // buttonGoToCheck
-            // 
-            buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonGoToCheck.Location = new Point(3, 178);
-            buttonGoToCheck.Name = "buttonGoToCheck";
-            buttonGoToCheck.Size = new Size(192, 49);
-            buttonGoToCheck.TabIndex = 6;
-            buttonGoToCheck.Text = "Передать на тесты";
-            buttonGoToCheck.UseVisualStyleBackColor = true;
-            buttonGoToCheck.Click += buttonGoToCheck_Click;
-            // 
-            // buttonRemoveMilitaryAircraft
-            // 
-            buttonRemoveMilitaryAircraft.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRemoveMilitaryAircraft.Location = new Point(4, 129);
-            buttonRemoveMilitaryAircraft.Name = "buttonRemoveMilitaryAircraft";
-            buttonRemoveMilitaryAircraft.Size = new Size(191, 49);
-            buttonRemoveMilitaryAircraft.TabIndex = 5;
-            buttonRemoveMilitaryAircraft.Text = "Удаление военного самолёта";
-            buttonRemoveMilitaryAircraft.UseVisualStyleBackColor = true;
-            buttonRemoveMilitaryAircraft.Click += buttonRemoveMilitaryAircraft_Click;
-            // 
-            // buttonAddMilitaryAircraft
-            // 
-            buttonAddMilitaryAircraft.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonAddMilitaryAircraft.Location = new Point(4, 3);
-            buttonAddMilitaryAircraft.Name = "buttonAddMilitaryAircraft";
-            buttonAddMilitaryAircraft.Size = new Size(191, 49);
-            buttonAddMilitaryAircraft.TabIndex = 1;
-            buttonAddMilitaryAircraft.Text = "Добавление военного самолёта";
-            buttonAddMilitaryAircraft.UseVisualStyleBackColor = true;
-            buttonAddMilitaryAircraft.Click += buttonAddMilitaryAircraft_Click;
-            // 
-            // maskedTextBoxPosition
-            // 
-            maskedTextBoxPosition.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            maskedTextBoxPosition.Location = new Point(3, 96);
-            maskedTextBoxPosition.Mask = "00";
-            maskedTextBoxPosition.Name = "maskedTextBoxPosition";
-            maskedTextBoxPosition.Size = new Size(192, 27);
-            maskedTextBoxPosition.TabIndex = 4;
-            maskedTextBoxPosition.ValidatingType = typeof(int);
-            // 
-            // buttonCreateCompany
-            // 
-            buttonCreateCompany.Location = new Point(7, 322);
-            buttonCreateCompany.Name = "buttonCreateCompany";
-            buttonCreateCompany.Size = new Size(191, 29);
-            buttonCreateCompany.TabIndex = 9;
-            buttonCreateCompany.Text = "Создание компании";
-            buttonCreateCompany.UseVisualStyleBackColor = true;
-            buttonCreateCompany.Click += buttonCreateCompany_Click;
+            pictureBox.Dock = DockStyle.Fill;
+            pictureBox.Location = new Point(0, 0);
+            pictureBox.Name = "pictureBox";
+            pictureBox.Size = new Size(712, 602);
+            pictureBox.TabIndex = 3;
+            pictureBox.TabStop = false;
            // 
            // panelStorage
            // 
            panelStorage.Controls.Add(buttonCollectionDel);
            panelStorage.Controls.Add(listBoxCollection);
            panelStorage.Controls.Add(buttonCollectionAdd);
-            panelStorage.Controls.Add(textBoxCollectionName);
-            panelStorage.Controls.Add(radioButtonMassive);
            panelStorage.Controls.Add(radioButtonList);
+            panelStorage.Controls.Add(radioButtonMassive);
+            panelStorage.Controls.Add(textBoxCollectionName);
            panelStorage.Controls.Add(labelCollectionName);
            panelStorage.Dock = DockStyle.Top;
            panelStorage.Location = new Point(3, 23);
            panelStorage.Name = "panelStorage";
-            panelStorage.Size = new Size(200, 256);
+            panelStorage.Size = new Size(200, 270);
            panelStorage.TabIndex = 8;
            // 
            // buttonCollectionDel
            // 
-            buttonCollectionDel.Location = new Point(6, 224);
+            buttonCollectionDel.Location = new Point(7, 239);
            buttonCollectionDel.Name = "buttonCollectionDel";
-            buttonCollectionDel.Size = new Size(189, 29);
+            buttonCollectionDel.Size = new Size(182, 27);
            buttonCollectionDel.TabIndex = 6;
-            buttonCollectionDel.Text = "Удаление коллекции";
+            buttonCollectionDel.Text = "Удалить коллекцию";
            buttonCollectionDel.UseVisualStyleBackColor = true;
            buttonCollectionDel.Click += buttonCollectionDel_Click;
            // 
@@ -180,32 +90,36 @@
            // 
            listBoxCollection.FormattingEnabled = true;
            listBoxCollection.ItemHeight = 20;
-            listBoxCollection.Location = new Point(6, 131);
+            listBoxCollection.Location = new Point(11, 129);
            listBoxCollection.Name = "listBoxCollection";
-            listBoxCollection.Size = new Size(189, 84);
+            listBoxCollection.Size = new Size(180, 104);
            listBoxCollection.TabIndex = 5;
            // 
            // buttonCollectionAdd
            // 
-            buttonCollectionAdd.Location = new Point(6, 96);
+            buttonCollectionAdd.Location = new Point(9, 96);
            buttonCollectionAdd.Name = "buttonCollectionAdd";
-            buttonCollectionAdd.Size = new Size(189, 29);
+            buttonCollectionAdd.Size = new Size(182, 27);
            buttonCollectionAdd.TabIndex = 4;
            buttonCollectionAdd.Text = "Добавить коллекцию";
            buttonCollectionAdd.UseVisualStyleBackColor = true;
            buttonCollectionAdd.Click += buttonCollectionAdd_Click;
            // 
-            // textBoxCollectionName
+            // radioButtonList
            // 
-            textBoxCollectionName.Location = new Point(6, 33);
-            textBoxCollectionName.Name = "textBoxCollectionName";
-            textBoxCollectionName.Size = new Size(189, 27);
-            textBoxCollectionName.TabIndex = 3;
+            radioButtonList.AutoSize = true;
+            radioButtonList.Location = new Point(117, 66);
+            radioButtonList.Name = "radioButtonList";
+            radioButtonList.Size = new Size(80, 24);
+            radioButtonList.TabIndex = 3;
+            radioButtonList.TabStop = true;
+            radioButtonList.Text = "Список";
+            radioButtonList.UseVisualStyleBackColor = true;
            // 
            // radioButtonMassive
            // 
            radioButtonMassive.AutoSize = true;
-            radioButtonMassive.Location = new Point(6, 66);
+            radioButtonMassive.Location = new Point(9, 66);
            radioButtonMassive.Name = "radioButtonMassive";
            radioButtonMassive.Size = new Size(82, 24);
            radioButtonMassive.TabIndex = 2;
@@ -213,21 +127,17 @@
            radioButtonMassive.Text = "Массив";
            radioButtonMassive.UseVisualStyleBackColor = true;
            // 
-            // radioButtonList
+            // textBoxCollectionName
            // 
-            radioButtonList.AutoSize = true;
-            radioButtonList.Location = new Point(115, 66);
-            radioButtonList.Name = "radioButtonList";
-            radioButtonList.Size = new Size(80, 24);
-            radioButtonList.TabIndex = 1;
-            radioButtonList.TabStop = true;
-            radioButtonList.Text = "Список";
-            radioButtonList.UseVisualStyleBackColor = true;
+            textBoxCollectionName.Location = new Point(9, 33);
+            textBoxCollectionName.Name = "textBoxCollectionName";
+            textBoxCollectionName.Size = new Size(188, 27);
+            textBoxCollectionName.TabIndex = 1;
            // 
            // labelCollectionName
            // 
            labelCollectionName.AutoSize = true;
-            labelCollectionName.Location = new Point(17, 10);
+            labelCollectionName.Location = new Point(24, 10);
            labelCollectionName.Name = "labelCollectionName";
            labelCollectionName.Size = new Size(158, 20);
            labelCollectionName.TabIndex = 0;
@@ -239,110 +149,137 @@
            comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
            comboBoxSelectorCompany.FormattingEnabled = true;
            comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
-            comboBoxSelectorCompany.Location = new Point(7, 285);
+            comboBoxSelectorCompany.Location = new Point(8, 299);
            comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
-            comboBoxSelectorCompany.Size = new Size(193, 28);
+            comboBoxSelectorCompany.Size = new Size(182, 28);
            comboBoxSelectorCompany.TabIndex = 0;
            comboBoxSelectorCompany.SelectedIndexChanged += comboBoxSelectorCompany_SelectedIndexChanged;
            // 
-            // pictureBox
+            // panelCompanyTools
            // 
-            pictureBox.Dock = DockStyle.Fill;
-            pictureBox.Location = new Point(0, 28);
-            pictureBox.Name = "pictureBox";
-            pictureBox.Size = new Size(744, 639);
-            pictureBox.TabIndex = 3;
-            pictureBox.TabStop = false;
+            panelCompanyTools.Controls.Add(buttonRefresh);
+            panelCompanyTools.Controls.Add(buttonAddMilitaryAircraft);
+            panelCompanyTools.Controls.Add(buttonGoToCheck);
+            panelCompanyTools.Controls.Add(buttonRemoveAir);
+            panelCompanyTools.Controls.Add(maskedTextBoxPosition);
+            panelCompanyTools.Dock = DockStyle.Bottom;
+            panelCompanyTools.Location = new Point(3, 362);
+            panelCompanyTools.Name = "panelCompanyTools";
+            panelCompanyTools.Size = new Size(200, 237);
+            panelCompanyTools.TabIndex = 10;
            // 
-            // menuStrip
+            // buttonRefresh
            // 
-            menuStrip.ImageScalingSize = new Size(20, 20);
-            menuStrip.Items.AddRange(new ToolStripItem[] { файлToolStripMenuItem });
-            menuStrip.Location = new Point(0, 0);
-            menuStrip.Name = "menuStrip";
-            menuStrip.Size = new Size(950, 28);
-            menuStrip.TabIndex = 4;
-            menuStrip.Text = "menuStrip";
+            buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRefresh.Location = new Point(6, 199);
+            buttonRefresh.Name = "buttonRefresh";
+            buttonRefresh.Size = new Size(179, 29);
+            buttonRefresh.TabIndex = 7;
+            buttonRefresh.Text = "Обновить";
+            buttonRefresh.UseVisualStyleBackColor = true;
+            buttonRefresh.Click += buttonRefresh_Click;
            // 
-            // файлToolStripMenuItem
+            // buttonAddMilitaryAircraft
            // 
-            файлToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { saveToolStripMenuItem, loadToolStripMenuItem });
-            файлToolStripMenuItem.Name = "файлToolStripMenuItem";
-            файлToolStripMenuItem.Size = new Size(59, 24);
-            файлToolStripMenuItem.Text = "Файл";
+            buttonAddMilitaryAircraft.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddMilitaryAircraft.Location = new Point(5, 12);
+            buttonAddMilitaryAircraft.Name = "buttonAddMilitaryAircraft";
+            buttonAddMilitaryAircraft.Size = new Size(193, 29);
+            buttonAddMilitaryAircraft.TabIndex = 1;
+            buttonAddMilitaryAircraft.Text = "Добавление самолёта";
+            buttonAddMilitaryAircraft.Click += ButtonAddMilitaryAircraft_Click;
            // 
-            // saveToolStripMenuItem
+            // buttonGoToCheck
            // 
-            saveToolStripMenuItem.Name = "saveToolStripMenuItem";
-            saveToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.S;
-            saveToolStripMenuItem.Size = new Size(227, 26);
-            saveToolStripMenuItem.Text = "Сохранение";
-            saveToolStripMenuItem.Click += saveToolStripMenuItem_Click;
+            buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonGoToCheck.Location = new Point(6, 161);
+            buttonGoToCheck.Name = "buttonGoToCheck";
+            buttonGoToCheck.Size = new Size(194, 29);
+            buttonGoToCheck.TabIndex = 6;
+            buttonGoToCheck.Text = "Передать на тесты";
+            buttonGoToCheck.UseVisualStyleBackColor = true;
+            buttonGoToCheck.Click += buttonGoToCheck_Click;
            // 
-            // loadToolStripMenuItem
+            // buttonRemoveAir
            // 
-            loadToolStripMenuItem.Name = "loadToolStripMenuItem";
-            loadToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.L;
-            loadToolStripMenuItem.Size = new Size(227, 26);
-            loadToolStripMenuItem.Text = "Загрузка";
-            loadToolStripMenuItem.Click += loadToolStripMenuItem_Click;
+            buttonRemoveAir.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRemoveAir.Location = new Point(9, 110);
+            buttonRemoveAir.Name = "buttonRemoveAir";
+            buttonRemoveAir.Size = new Size(182, 29);
+            buttonRemoveAir.TabIndex = 5;
+            buttonRemoveAir.Text = "Удаление самолёта";
+            buttonRemoveAir.UseVisualStyleBackColor = true;
+            buttonRemoveAir.Click += buttonRemoveAir_Click;
            // 
-            // saveFileDialog
+            // maskedTextBoxPosition
            // 
-            saveFileDialog.Filter = "txt file | *.txt";
+            maskedTextBoxPosition.Location = new Point(11, 62);
+            maskedTextBoxPosition.Mask = "00";
+            maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            maskedTextBoxPosition.Size = new Size(194, 27);
+            maskedTextBoxPosition.TabIndex = 4;
+            maskedTextBoxPosition.ValidatingType = typeof(int);
            // 
-            // openFileDialog
+            // buttonCreateCompany
            // 
-            openFileDialog.Filter = "txt file | *.txt";
+            buttonCreateCompany.Location = new Point(7, 329);
+            buttonCreateCompany.Name = "buttonCreateCompany";
+            buttonCreateCompany.Size = new Size(182, 27);
+            buttonCreateCompany.TabIndex = 9;
+            buttonCreateCompany.Text = "Создать компанию";
+            buttonCreateCompany.UseVisualStyleBackColor = true;
+            buttonCreateCompany.Click += buttonCreateCompany_Click;
+            // 
+            // groupBoxTools
+            // 
+            groupBoxTools.Controls.Add(buttonCreateCompany);
+            groupBoxTools.Controls.Add(panelCompanyTools);
+            groupBoxTools.Controls.Add(comboBoxSelectorCompany);
+            groupBoxTools.Controls.Add(panelStorage);
+            groupBoxTools.Dock = DockStyle.Right;
+            groupBoxTools.Location = new Point(712, 0);
+            groupBoxTools.Name = "groupBoxTools";
+            groupBoxTools.Size = new Size(206, 602);
+            groupBoxTools.TabIndex = 0;
+            groupBoxTools.TabStop = false;
+            groupBoxTools.Text = "Инструменты";
            // 
            // FormMilitaryAircraftCollection
            // 
            AutoScaleDimensions = new SizeF(8F, 20F);
            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(950, 667);
+            ClientSize = new Size(918, 602);
            Controls.Add(pictureBox);
            Controls.Add(groupBoxTools);
-            Controls.Add(menuStrip);
-            MainMenuStrip = menuStrip;
            Name = "FormMilitaryAircraftCollection";
-            Text = "Коллекция военных самолётов";
-            groupBoxTools.ResumeLayout(false);
-            panelCompanyTools.ResumeLayout(false);
-            panelCompanyTools.PerformLayout();
+            Text = "Коллекция самолётов";
+            ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
            panelStorage.ResumeLayout(false);
            panelStorage.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
-            menuStrip.ResumeLayout(false);
-            menuStrip.PerformLayout();
+            panelCompanyTools.ResumeLayout(false);
+            panelCompanyTools.PerformLayout();
+            groupBoxTools.ResumeLayout(false);
            ResumeLayout(false);
-            PerformLayout();
        }

        #endregion
-
-        private GroupBox groupBoxTools;
-        private ComboBox comboBoxSelectorCompany;
-        private Button buttonAddMilitaryAircraft;
-        private MaskedTextBox maskedTextBoxPosition;
        private PictureBox pictureBox;
-        private Button buttonRefresh;
-        private Button buttonGoToCheck;
-        private Button buttonRemoveMilitaryAircraft;
        private Panel panelStorage;
-        private TextBox textBoxCollectionName;
-        private RadioButton radioButtonMassive;
-        private RadioButton radioButtonList;
-        private Label labelCollectionName;
        private Button buttonCollectionDel;
        private ListBox listBoxCollection;
        private Button buttonCollectionAdd;
-        private Button buttonCreateCompany;
+        private RadioButton radioButtonList;
+        private RadioButton radioButtonMassive;
+        private TextBox textBoxCollectionName;
+        private Label labelCollectionName;
+        private ComboBox comboBoxSelectorCompany;
        private Panel panelCompanyTools;
-        private MenuStrip menuStrip;
-        private ToolStripMenuItem файлToolStripMenuItem;
-        private ToolStripMenuItem saveToolStripMenuItem;
-        private ToolStripMenuItem loadToolStripMenuItem;
-        private SaveFileDialog saveFileDialog;
-        private OpenFileDialog openFileDialog;
+        private Button buttonRefresh;
+        private Button buttonAddMilitaryAircraft;
+        private Button buttonGoToCheck;
+        private Button buttonRemoveAir;
+        private MaskedTextBox maskedTextBoxPosition;
+        private Button buttonCreateCompany;
+        private GroupBox groupBoxTools;
    }
 }
--- a/AirFighter/AirFighter/FormMilitaryAircraftCollection.cs
+++ b/AirFighter/AirFighter/FormMilitaryAircraftCollection.cs
@@ -1,7 +1,5 @@
-using Microsoft.Extensions.Logging;
-using ProjectAirFighter.CollectionGenericObjects;
+using ProjectAirFighter.CollectionGenericObjects;
 using ProjectAirFighter.Drawnings;
-using ProjectAirFighter.Exceptions;

 namespace ProjectAirFighter;

@@ -17,27 +15,15 @@ public partial class FormMilitaryAircraftCollection : Form
    /// </summary>
    private AbstractCompany? _company = null;

-    /// <summary>
-    /// Логер
-    /// </summary>
-    private readonly ILogger _logger;
-
    /// <summary>
 	/// Конструктор
 	/// </summary>
-    public FormMilitaryAircraftCollection(ILogger<FormMilitaryAircraftCollection> logger)
+    public FormMilitaryAircraftCollection()
    {
        InitializeComponent();
        _storageCollection = new();
-        _logger = logger;
-        _logger.LogInformation("Форма загрузилась");
    }

-    /// <summary>
-    /// Выбор компании
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
    private void comboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
    {
        panelCompanyTools.Enabled = false;
@@ -48,15 +34,14 @@ public partial class FormMilitaryAircraftCollection : Form
    /// </summary>
    /// <param name="sender"></param>
    /// <param name="e"></param>
-    private void buttonAddMilitaryAircraft_Click(object sender, EventArgs e)
+    private void ButtonAddMilitaryAircraft_Click(object sender, EventArgs e)
    {
        FormMilitaryAircraftConfig form = new();
        form.Show();
        form.AddEvent(SetMilitaryAircraft);
    }

-
-    // <summary>
+    /// <summary>
    /// Добавление военного самолёта в коллекцию
    /// </summary>
    /// <param name="militaryAircraft"></param>
@@ -67,28 +52,23 @@ public partial class FormMilitaryAircraftCollection : Form
            return;
        }

-        try
+        if (_company + militaryAircraft != -1)
        {
-            var res = _company + militaryAircraft;
            MessageBox.Show("Объект добавлен");
-            _logger.LogInformation($"Объект добавлен под индексом {res}");
            pictureBox.Image = _company.Show();
        }
-        catch (Exception ex)
+        else
        {
-            MessageBox.Show($"Объект не добавлен: {ex.Message}", "Результат", MessageBoxButtons.OK,
-                MessageBoxIcon.Error);
-            _logger.LogError($"Ошибка: {ex.Message}", ex.Message);
+            MessageBox.Show("Не удалось добавить объект");
        }
    }

-
    /// <summary>
    /// Удаление объекта
    /// </summary>
    /// <param name="sender"></param>
    /// <param name="e"></param>
-    private void buttonRemoveMilitaryAircraft_Click(object sender, EventArgs e)
+    private void buttonRemoveAir_Click(object sender, EventArgs e)
    {
        if (string.IsNullOrEmpty(maskedTextBoxPosition.Text) || _company == null)
        {
@@ -101,18 +81,14 @@ public partial class FormMilitaryAircraftCollection : Form
        }

        int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-        try
+        if (_company - pos != null)
        {
-            var res = _company - pos;
            MessageBox.Show("Объект удален");
-            _logger.LogInformation($"Объект удален под индексом {pos}");
            pictureBox.Image = _company.Show();
        }
-        catch (Exception ex)
+        else
        {
-            MessageBox.Show(ex.Message, "Не удалось удалить объект",
-                MessageBoxButtons.OK, MessageBoxIcon.Error);
-            _logger.LogError($"Ошибка: {ex.Message}", ex.Message);
+            MessageBox.Show("Не удалось удалить объект");
        }
    }

@@ -167,6 +143,11 @@ public partial class FormMilitaryAircraftCollection : Form
        pictureBox.Image = _company.Show();
    }

+    /// <summary>
+    /// Добавление коллекции
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
    private void buttonCollectionAdd_Click(object sender, EventArgs e)
    {
        if (string.IsNullOrEmpty(textBoxCollectionName.Text) || (!radioButtonList.Checked && !radioButtonMassive.Checked))
@@ -185,19 +166,14 @@ public partial class FormMilitaryAircraftCollection : Form
            collectionType = CollectionType.List;
        }

-        try
-        {
-            _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
-            _logger.LogInformation("Добавление коллекции");
-            RerfreshListBoxItems();
-        }
-        catch (Exception ex)
-        {
-            MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            _logger.LogError($"Ошибка: {ex.Message}", ex.Message);
-        }
+        _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
+        RerfreshListBoxItems();
    }
-
+    /// <summary>
+    /// Удаление коллекции
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
    private void buttonCollectionDel_Click(object sender, EventArgs e)
    {
        if (listBoxCollection.SelectedItem == null)
@@ -210,10 +186,12 @@ public partial class FormMilitaryAircraftCollection : Form
            return;
        }
        _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
-        _logger.LogInformation("Коллекция удалена");
        RerfreshListBoxItems();
    }

+    /// <summary>
+    /// Обновление списка в listBoxCollection
+    /// </summary>
    private void RerfreshListBoxItems()
    {
        listBoxCollection.Items.Clear();
@@ -228,6 +206,12 @@ public partial class FormMilitaryAircraftCollection : Form

    }

+
+    /// <summary>
+    /// Создание компании
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
    private void buttonCreateCompany_Click(object sender, EventArgs e)
    {
        if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
@@ -247,48 +231,10 @@ public partial class FormMilitaryAircraftCollection : Form
        {
            case "Хранилище":
                _company = new Angar(pictureBox.Width, pictureBox.Height, collection);
-                _logger.LogInformation("Компания создана");
                break;
        }

        panelCompanyTools.Enabled = true;
        RerfreshListBoxItems();
    }
-
-    private void saveToolStripMenuItem_Click(object sender, EventArgs e)
-    {
-        if (saveFileDialog.ShowDialog() == DialogResult.OK)
-        {
-            try
-            {
-                _storageCollection.SaveData(saveFileDialog.FileName);
-                MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                _logger.LogInformation("Сохранение в файл: {filename}", saveFileDialog.FileName);
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show("Не сохранилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                _logger.LogError("Ошибка: {Message}", ex.Message);
-            }
-        }
-    }
-
-    private void loadToolStripMenuItem_Click(object sender, EventArgs e)
-    {
-        if (openFileDialog.ShowDialog() == DialogResult.OK)
-        {
-            try
-            {
-                _storageCollection.LoadData(openFileDialog.FileName);
-                RerfreshListBoxItems();
-                MessageBox.Show("Загрузка прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                _logger.LogInformation("Загрузка из файла: {filename}", openFileDialog.FileName);
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show("Загрузка не выполнена", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                _logger.LogError("Ошибка: {Message}", ex.Message);
-            }
-        }
-    }
 }
--- a/AirFighter/AirFighter/FormMilitaryAircraftCollection.resx
+++ b/AirFighter/AirFighter/FormMilitaryAircraftCollection.resx
@@ -117,13 +117,4 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
-  <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>145, 17</value>
-  </metadata>
-  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>310, 17</value>
-  </metadata>
 </root>
--- a/AirFighter/AirFighter/FormMilitaryAircraftConfig.cs
+++ b/AirFighter/AirFighter/FormMilitaryAircraftConfig.cs
@@ -41,14 +41,7 @@ public partial class FormMilitaryAircraftConfig : Form
    /// <param name="militaryAircraftDelegate"></param>
    public void AddEvent(Action<DrawningMilitaryAircraft> militaryAircraftDelegate)
    {
-        if (MilitaryAircraftDelegate != null)
-        {
-            MilitaryAircraftDelegate = militaryAircraftDelegate;
-        }
-        else
-        {
-            MilitaryAircraftDelegate += militaryAircraftDelegate;
-        }
+        MilitaryAircraftDelegate += militaryAircraftDelegate;
    }

    /// <summary>
@@ -114,6 +107,10 @@ public partial class FormMilitaryAircraftConfig : Form
        (sender as Panel)?.DoDragDrop((sender as Panel)?.BackColor, DragDropEffects.Move | DragDropEffects.Copy);
    }

+    // TODO Реализовать логику смены цветов: основного и дополнительного (для продвинутого объекта)
+
+
+
    /// <summary>
    /// Проверка получаемой информации (ее типа на соответствие требуемому)
    /// </summary>
@@ -153,6 +150,9 @@ public partial class FormMilitaryAircraftConfig : Form
        }
    }

+
+    //конец туду
+
    /// <summary>
    /// Передача объекта
    /// </summary>
--- a/AirFighter/AirFighter/MilitaryAircraftDelegate.cs
+++ b/AirFighter/AirFighter/MilitaryAircraftDelegate.cs
@@ -0,0 +1,9 @@
+using ProjectAirFighter.Drawnings;
+
+namespace ProjectAirFighter;
+
+/// <summary>
+/// Делегат передачи объекта класса-прорисовки
+/// </summary>
+/// <param name="militaryAircraft"></param>
+public delegate void MilitaryAircraftDelegate(DrawningMilitaryAircraft militaryAircraft);
--- a/AirFighter/AirFighter/MovementStrategy/MoveToBorder.cs
+++ b/AirFighter/AirFighter/MovementStrategy/MoveToBorder.cs
@@ -10,10 +10,8 @@ public class MoveToBorder : AbstractStrategy
            return false;
        }

-        return objParams.RightBorder <= FieldWidth &&
-            objParams.RightBorder + GetStep() >= FieldWidth &&
-            objParams.DownBorder <= FieldHeight &&
-            objParams.DownBorder + GetStep() >= FieldHeight;
+        return objParams.RightBorder <= FieldWidth && objParams.RightBorder + GetStep() >= FieldWidth &&
+            objParams.DownBorder <= FieldHeight && objParams.DownBorder + GetStep() >= FieldHeight;
    }

    protected override void MoveToTarget()
--- a/AirFighter/AirFighter/MovementStrategy/MoveToCenter.cs
+++ b/AirFighter/AirFighter/MovementStrategy/MoveToCenter.cs
@@ -13,9 +13,9 @@ public class MoveToCenter : AbstractStrategy
            return false;
        }

-        return objParams.ObjectMiddleHorizontal - GetStep() <= FieldWidth / 2 &&
+        return objParams.ObjectMiddleHorizontal - GetStep() <= FieldWidth / 2 && 
            objParams.ObjectMiddleHorizontal + GetStep() >= FieldWidth / 2 &&
-            objParams.ObjectMiddleVertical - GetStep() <= FieldHeight / 2 &&
+            objParams.ObjectMiddleVertical - GetStep() <= FieldHeight / 2 && 
            objParams.ObjectMiddleVertical + GetStep() >= FieldHeight / 2;
    }

--- a/AirFighter/AirFighter/MovementStrategy/MoveableMilitaryAircraft.cs
+++ b/AirFighter/AirFighter/MovementStrategy/MoveableMilitaryAircraft.cs
@@ -3,7 +3,7 @@
 namespace ProjectAirFighter.MovementStrategy;

 /// <summary>
-/// Класс-реализация IMoveableObject с использованием DrawningMilitaryAircraft
+/// Класс-реализация IMoveableObject с использованием DrawningCar
 /// </summary>
 public class MoveableMilitaryAircraft : IMoveableObject
 {
--- a/AirFighter/AirFighter/Program.cs
+++ b/AirFighter/AirFighter/Program.cs
@@ -1,50 +1,17 @@
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Serilog;
-
-namespace ProjectAirFighter;
-
-internal static class Program
+namespace ProjectAirFighter
 {
-    /// <summary>
-    ///  The main entry point for the application.
-    /// </summary>
-    [STAThread]
-    static void Main()
+    internal static class Program
    {
-        // To customize application configuration such as set high DPI settings or default font,
-        // see https://aka.ms/applicationconfiguration.
-        ApplicationConfiguration.Initialize();
-
-        var services = new ServiceCollection();
-        ConfigureServices(services);
-        using ServiceProvider serviceProvider = services.BuildServiceProvider();
-        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)
-    {
-        services.AddSingleton<FormMilitaryAircraftCollection>().AddLogging(option =>
+        /// <summary>
+        ///  The main entry point for the application.
+        /// </summary>
+        [STAThread]
+        static void Main()
        {
-            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);
-        });
+            // To customize application configuration such as set high DPI settings or default font,
+            // see https://aka.ms/applicationconfiguration.
+            ApplicationConfiguration.Initialize();
+            Application.Run(new FormMilitaryAircraftCollection());
+        }
    }
 }
--- a/AirFighter/AirFighter/ProjectAirFighter.csproj
+++ b/AirFighter/AirFighter/ProjectAirFighter.csproj
@@ -8,16 +8,6 @@
    <ImplicitUsings>enable</ImplicitUsings>
  </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="Serilog" Version="3.1.1" />
-    <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
-    <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
-  </ItemGroup>
-
  <ItemGroup>
    <Compile Update="Properties\Resources.Designer.cs">
      <DesignTime>True</DesignTime>
--- a/AirFighter/AirFighter/Properties/Resources.resx
+++ b/AirFighter/AirFighter/Properties/Resources.resx
@@ -28,7 +28,7 @@
    </data>
                
    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
+    name/value pmilitaryAircrafts.
    
    Each data row contains a name, and value. The row also contains a 
    type or mimetype. Type corresponds to a .NET class that support 
--- a/AirFighter/AirFighter/serilogConfig.json
+++ b/AirFighter/AirFighter/serilogConfig.json
@@ -1,20 +0,0 @@
-{
-  "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"
-    }
-  }
-}
Author	SHA1	Message	Date
ikswi	12dd60db3f	последний вариант	2024-04-04 09:42:34 +04:00
ikswi	4909a7ffea	не до конца	2024-04-03 16:04:24 +04:00
ikswi	6684f887d0	не до конца	2024-04-03 15:57:29 +04:00
ikswi	ab47d675ec	Внесены изменения в именах	2024-04-01 01:18:15 +04:00
ikswi	1f06635803	4 лабораторная работа	2024-03-30 05:03:10 +04:00
ikswi	9654506023	Компания	2024-03-26 00:09:01 +04:00
ikswi	d39c9e27bc	Коллекция объектов	2024-03-15 20:28:52 +04:00