в

ы
2024-05-22 21:54:27 +04:00 · 2024-05-22 21:51:19 +04:00 · 2024-05-22 03:38:35 +04:00 · 2024-05-22 03:00:46 +04:00
36 changed files with 285 additions and 1899 deletions
--- a/ArtilleryUnit/ArtilleryUnit/ArtilleryUnit.csproj
+++ b/ArtilleryUnit/ArtilleryUnit/ArtilleryUnit.csproj
@@ -8,15 +8,4 @@
    <ImplicitUsings>enable</ImplicitUsings>
  </PropertyGroup>

-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
-    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.11" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
-    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
-  </ItemGroup>
-
 </Project>
--- a/ArtilleryUnit/ArtilleryUnit/CollectionGenericObjects/AbstractCompany.cs
+++ b/ArtilleryUnit/ArtilleryUnit/CollectionGenericObjects/AbstractCompany.cs
@@ -1,5 +1,4 @@
 using ProjectArtilleryUnit.Drawnings;
-using ProjectArtilleryUnit.Exceptions;

 namespace ProjectArtilleryUnit.CollectionGenericObjects
 {
@@ -29,14 +28,14 @@ namespace ProjectArtilleryUnit.CollectionGenericObjects
        protected readonly int _pictureHeight;

        /// <summary>
-        /// Коллекция артиллерийских установок
+        /// Коллекция танков
        /// </summary>
        protected ICollectionGenericObjects<DrawningArtilleryUnit>? _collection = null;

        /// <summary>
        /// Вычисление максимального количества элементов, который можно разместить в окне
        /// </summary>
-        private int GetMaxCount => (_pictureWidth / _placeSizeWidth) * (_pictureHeight / _placeSizeHeight);
+        private int GetMaxCount => _pictureWidth * _pictureHeight / (_placeSizeWidth * _placeSizeHeight);

        /// <summary>
        /// Конструктор
@@ -50,7 +49,7 @@ namespace ProjectArtilleryUnit.CollectionGenericObjects
            _pictureWidth = picWidth;
            _pictureHeight = picHeight;
            _collection = collection;
-            _collection.MaxCount = GetMaxCount;
+            _collection.SetMaxCount = GetMaxCount;
        }

        /// <summary>
@@ -61,7 +60,7 @@ namespace ProjectArtilleryUnit.CollectionGenericObjects
        /// <returns></returns>
        public static int operator +(AbstractCompany company, DrawningArtilleryUnit  сruiser)
        {
-            return company._collection.Insert(сruiser, new DrawiningArtilleryUnitEqutables()); 
+            return company._collection.Insert(сruiser);
        }

        /// <summary>
@@ -97,25 +96,11 @@ namespace ProjectArtilleryUnit.CollectionGenericObjects
            SetObjectsPosition();
            for (int i = 0; i < (_collection?.Count ?? 0); ++i)
            {
-                try
-                {
-                    DrawningArtilleryUnit? obj = _collection?.Get(i);
-                    obj?.DrawTransport(graphics);
-                }
-                catch (ObjectNotFoundException e)
-                { }
-                catch (PositionOutOfCollectionException e)
-                { }
+                DrawningArtilleryUnit? obj = _collection?.Get(i);
+                obj?.DrawTransport(graphics);
            }
            return bitmap;
        }
-
-        /// <summary>
-        /// Сортировка
-        /// </summary>
-        /// <param name="comparer">Сравнитель объектов</param>
-        public void Sort(IComparer<DrawningArtilleryUnit?> comparer) => _collection?.CollectionSort(comparer);
-
        /// <summary>
        /// Вывод заднего фона
        /// </summary>
--- a/ArtilleryUnit/ArtilleryUnit/CollectionGenericObjects/ArtilleryUnitDockingService.cs
+++ b/ArtilleryUnit/ArtilleryUnit/CollectionGenericObjects/ArtilleryUnitDockingService.cs
@@ -1,5 +1,4 @@
 using ProjectArtilleryUnit.Drawnings;
-using ProjectArtilleryUnit.Exceptions;

 namespace ProjectArtilleryUnit.CollectionGenericObjects
 {
@@ -23,7 +22,7 @@ namespace ProjectArtilleryUnit.CollectionGenericObjects
            int width = _pictureWidth / _placeSizeWidth;
            int height = _pictureHeight / _placeSizeHeight;
            Pen pen = new(Color.Black, 2);
-            for (int i = 0; i < width; i++)
+            for (int i = 0; i < width + 1; i++)
            {
                for (int j = 0; j < height + 1; ++j)
                {
@@ -42,16 +41,13 @@ namespace ProjectArtilleryUnit.CollectionGenericObjects

            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 < width - 1)
+                if (curWidth < width )
                    curWidth++;
                else
                {
--- a/ArtilleryUnit/ArtilleryUnit/CollectionGenericObjects/CollectionInfo.cs
+++ b/ArtilleryUnit/ArtilleryUnit/CollectionGenericObjects/CollectionInfo.cs
@@ -1,75 +0,0 @@
-namespace ProjectArtilleryUnit.CollectionGenericObjects;
-
-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/ArtilleryUnit/ArtilleryUnit/CollectionGenericObjects/ICollectionGenericObjects.cs
+++ b/ArtilleryUnit/ArtilleryUnit/CollectionGenericObjects/ICollectionGenericObjects.cs
@@ -1,6 +1,4 @@
-using ProjectArtilleryUnit.Drawnings;
-
-namespace ProjectArtilleryUnit.CollectionGenericObjects
+namespace ProjectArtilleryUnit.CollectionGenericObjects
 {
    /// <summary>
    /// Интерфейс описания действий для набора хранимых объектов
@@ -17,15 +15,14 @@ namespace ProjectArtilleryUnit.CollectionGenericObjects
        /// <summary>
        /// Установка максимального количества элементов
        /// </summary>
-        int MaxCount { get; set; }
+        int SetMaxCount { set; }

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

        /// <summary>
        /// Добавление объекта в коллекцию на конкретную позицию
@@ -33,7 +30,7 @@ namespace ProjectArtilleryUnit.CollectionGenericObjects
        /// <param name="obj">Добавляемый объект</param>
        /// <param name="position">Позиция</param>
        /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
-        int Insert(T obj, int position, IEqualityComparer<DrawningArtilleryUnit?>? comparer = null);
+        int Insert(T obj, int position);

        /// <summary>
        /// Удаление объекта из коллекции с конкретной позиции
@@ -48,23 +45,6 @@ namespace ProjectArtilleryUnit.CollectionGenericObjects
        /// <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/ArtilleryUnit/ArtilleryUnit/CollectionGenericObjects/ListGenericObjects.cs
+++ b/ArtilleryUnit/ArtilleryUnit/CollectionGenericObjects/ListGenericObjects.cs
@@ -1,7 +1,4 @@
-using ProjectArtilleryUnit.Drawnings;
-using ProjectArtilleryUnit.Exceptions;
-
-namespace ProjectArtilleryUnit.CollectionGenericObjects
+namespace ProjectArtilleryUnit.CollectionGenericObjects
 {
    /// <summary>
    /// Параметризованный набор объектов
@@ -19,20 +16,7 @@ namespace ProjectArtilleryUnit.CollectionGenericObjects
        /// </summary>
        private int _maxCount;
        public int Count => _collection.Count;
-        public int MaxCount
-        {
-            get => _maxCount;
-            set
-            {
-                if (value > 0)
-                {
-                    _maxCount = value;
-                }
-            }
-        }
-
-        public CollectionType GetCollectionType => CollectionType.List;
-
+        public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } }
        /// <summary>
        /// Конструктор
        /// </summary>
@@ -43,43 +27,26 @@ namespace ProjectArtilleryUnit.CollectionGenericObjects
        public T? Get(int position)
        {
            // TODO проверка позиции
-            // TODO выброc позиций, если выход за границы массива
-            if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position);
+            if (position >= Count || position < 0) return null;
            return _collection[position];
        }

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

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

@@ -88,26 +55,11 @@ namespace ProjectArtilleryUnit.CollectionGenericObjects
        public T Remove(int position)
        {
            // TODO проверка позиции
-            // TODO выбром позиций, если выход за границы массива
            // TODO удаление объекта из списка
-            if (position >= _collection.Count || position < 0) throw new PositionOutOfCollectionException(position);
-
+            if (position >= Count || position < 0) return null;
            T obj = _collection[position];
            _collection.RemoveAt(position);
            return obj;
        }
-
-        public IEnumerable<T?> GetItems()
-        {
-            for (int i = 0; i < _collection.Count; ++i)
-            {
-                yield return _collection[i];
-            }
-        }
-
-        public void CollectionSort(IComparer<T?> comparer)
-        {
-            _collection.Sort(comparer);
-        }
    }
 }
--- a/ArtilleryUnit/ArtilleryUnit/CollectionGenericObjects/MassiveGenericObjects.cs
+++ b/ArtilleryUnit/ArtilleryUnit/CollectionGenericObjects/MassiveGenericObjects.cs
@@ -1,5 +1,4 @@
 using ProjectArtilleryUnit.Drawnings;
-using ProjectArtilleryUnit.Exceptions;

 namespace ProjectArtilleryUnit.CollectionGenericObjects
 {
@@ -15,12 +14,8 @@ namespace ProjectArtilleryUnit.CollectionGenericObjects
        /// </summary>
        private T?[] _collection;
        public int Count => _collection.Length;
-        public int MaxCount
+        public int SetMaxCount
        {
-            get
-            {
-                return _collection.Length;
-            }
            set
            {
                if (value > 0)
@@ -37,8 +32,6 @@ namespace ProjectArtilleryUnit.CollectionGenericObjects
            }
        }

-        public CollectionType GetCollectionType => CollectionType.Massive;
-
        /// <summary>
        /// Конструктор
        /// </summary>
@@ -49,115 +42,74 @@ namespace ProjectArtilleryUnit.CollectionGenericObjects
        public T? Get(int position)
        {
            // TODO проверка позиции
-            // TODO выбром позиций, если выход за границы массива
-            // TODO выбром позиций, если объект пустой 
-            if (position < 0 || position >= Count) throw new PositionOutOfCollectionException(position);
-            if (_collection[position] == null) throw new ObjectNotFoundException(position);
+            if (position >= _collection.Length || position < 0)
+            { return null; }
            return _collection[position];
        }

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

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

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

+            if (_collection[position] == null)
+            {
+                _collection[position] = obj;
+                return position;
            }
+            int index;

-            if (position < 0 || position >= Count) throw new PositionOutOfCollectionException(position);
-
-            if (_collection[position] != null)
+            for (index = position + 1; index < _collection.Length; ++index)
            {
-                bool pushed = false;
-                for (int index = position + 1; index < Count; index++)
+                if (_collection[index] == null)
                {
-                    if (_collection[index] == null)
-                    {
-                        position = index;
-                        pushed = true;
-                        break;
-                    }
-                }
-
-                if (!pushed)
-                {
-                    for (int index = position - 1; index >= 0; index--)
-                    {
-                        if (_collection[index] == null)
-                        {
-                            position = index;
-                            pushed = true;
-                            break;
-                        }
-                    }
-                }
-
-                if (!pushed)
-                {
-                    throw new CollectionOverflowException(Count);
+                    _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)
        {
            // TODO проверка позиции
            // TODO удаление объекта из массива, присвоив элементу массива значение null
-            // TODO выбром позиций, если выход за границы массива
-            // TODO выбром позиций, если объект пустой 
-            if (position < 0 || position >= Count) throw new PositionOutOfCollectionException(position);
-
-            if (_collection[position] == null) throw new ObjectNotFoundException(position);
-
-            T? temp = _collection[position];
+            if (position >= _collection.Length || position < 0)
+            { return null; }
+            T obj = _collection[position];
            _collection[position] = null;
-            return temp;
-        }
-
-        public IEnumerable<T?> GetItems()
-        {
-            for (int i = 0; i < _collection.Length; ++i)
-            {
-                yield return _collection[i];
-            }
-        }
-
-        public void CollectionSort(IComparer<T?> comparer)
-        {
-            Array.Sort(_collection, comparer);
+            return obj;
        }
    }
 }
--- a/ArtilleryUnit/ArtilleryUnit/CollectionGenericObjects/StorageCollection.cs
+++ b/ArtilleryUnit/ArtilleryUnit/CollectionGenericObjects/StorageCollection.cs
@@ -1,46 +1,27 @@
-using ProjectArtilleryUnit.Drawnings;
-using ProjectArtilleryUnit.Exceptions;
-using System.Text;
-
-namespace ProjectArtilleryUnit.CollectionGenericObjects
+namespace ProjectArtilleryUnit.CollectionGenericObjects
 {
    // Класс-хранилище коллекций
    /// </summary>
    /// <typeparam name="T"></typeparam>
    public class StorageCollection<T>
-        where T : DrawningArtilleryUnit
+        where T : class
    {
        /// <summary>
        /// Словарь (хранилище) с коллекциями
        /// </summary>
-        readonly Dictionary<CollectionInfo, ICollectionGenericObjects<T>> _storages;
+        readonly Dictionary<string, ICollectionGenericObjects<T>> _storages;

        /// <summary>
        /// Возвращение списка названий коллекций
        /// </summary>
-        public List<CollectionInfo> Keys => _storages.Keys.ToList();
-
-        /// <summary>
-        /// Ключевое слово, с которого должен начинаться файл
-        /// </summary>
-        private readonly string _collectionKey = "CollectionsStorage";
-
-        /// <summary>
-        /// Разделитель для записи ключа и значения элемента словаря
-        /// </summary>
-        private readonly string _separatorForKeyValue = "|";
-
-        /// <summary>
-        /// Разделитель для записей коллекции данных в файл
-        /// </summary>
-        private readonly string _separatorItems = ";";
+        public List<string> Keys => _storages.Keys.ToList();

        /// <summary>
        /// Конструктор
        /// </summary>
        public StorageCollection()
        {
-            _storages = new Dictionary<CollectionInfo, ICollectionGenericObjects<T>>();
+            _storages = new Dictionary<string, ICollectionGenericObjects<T>>();
        }

        /// <summary>
@@ -48,40 +29,29 @@ namespace ProjectArtilleryUnit.CollectionGenericObjects
        /// </summary>
        /// <param name="name">Название коллекции</param>
        /// <param name="collectionType">тип коллекции</param>
-        public void AddCollection(CollectionInfo name)
+        public void AddCollection(string name, CollectionType collectionType)
        {
            // TODO проверка, что name не пустой и нет в словаре записи с таким ключом
            // TODO Прописать логику для добавления

-            if (name == null || _storages.ContainsKey(name))
-            {
-                return;
-            }
+            if (_storages.ContainsKey(name)) return;

-            if (name.CollectionType == CollectionType.Massive)
-            {
-                _storages.Add(name, new MassiveGenericObjects<T>());
-            }
-
-            if (name.CollectionType == CollectionType.List)
-            {
-                _storages.Add(name, new ListGenericObjects<T>());
-            }
+            if (collectionType == CollectionType.None) return;
+            else if (collectionType == CollectionType.Massive)
+                _storages[name] = new MassiveGenericObjects<T>();
+            else if (collectionType == CollectionType.List)
+                _storages[name] = new ListGenericObjects<T>();
        }

        /// <summary>
        /// Удаление коллекции
        /// </summary>
        /// <param name="name">Название коллекции</param>
-        public void DelCollection(CollectionInfo name)
+        public void DelCollection(string name)
        {
            // TODO Прописать логику для удаления коллекции
-            if (name == null || !_storages.ContainsKey(name))
-            {
-                return;
-            }
-
-            _storages.Remove(name);
+            if (_storages.ContainsKey(name))
+                _storages.Remove(name);
        }

        /// <summary>
@@ -89,144 +59,15 @@ namespace ProjectArtilleryUnit.CollectionGenericObjects
        /// </summary>
        /// <param name="name">Название коллекции</param>
        /// <returns></returns>
-        public ICollectionGenericObjects<T>? this[CollectionInfo name]
+        public ICollectionGenericObjects<T>? this[string name]
        {
            get
            {
                // TODO Продумать логику получения объекта
                if (_storages.ContainsKey(name))
-                {
                    return _storages[name];
-                }
-
                return null;
            }
        }
-
-        /// <summary>
-        /// Сохранение информации по самолетам в хранилище в файл
-        /// </summary>
-        /// <param name="filename">Путь и имя файла</param>
-        /// <returns>true - сохранение прошло успешно, false - ошибка при сохранении данных</returns>
-        public void SaveData(string filename)
-        {
-            if (_storages.Count == 0)
-            {
-                throw new Exception("В хранилище отсутствуют коллекции для сохранения");
-            }
-
-
-            if (File.Exists(filename))
-            {
-                File.Delete(filename);
-            }
-
-            using FileStream fs = new(filename, FileMode.Create);
-            using StreamWriter streamWriter = new StreamWriter(fs);
-            streamWriter.Write(_collectionKey);
-
-            foreach (KeyValuePair<CollectionInfo, ICollectionGenericObjects<T>> value in _storages)
-            {
-                streamWriter.Write(Environment.NewLine);
-
-                if (value.Value.Count == 0)
-                {
-                    continue;
-                }
-
-                streamWriter.Write(value.Key);
-                streamWriter.Write(_separatorForKeyValue);
-                streamWriter.Write(value.Value.MaxCount);
-                streamWriter.Write(_separatorForKeyValue);
-
-
-                foreach (T? item in value.Value.GetItems())
-                {
-                    string data = item?.GetDataForSave() ?? string.Empty;
-                    if (string.IsNullOrEmpty(data))
-                    {
-                        continue;
-                    }
-
-
-                    streamWriter.Write(data);
-                    streamWriter.Write(_separatorItems);
-
-                }
-            }
-        }
-        /// <summary>
-        /// Загрузка информации по кораблям в хранилище из файла
-        /// </summary>
-        /// <param name="filename"></param>
-        public void LoadData(string filename)
-        {
-            if (!File.Exists(filename))
-            {
-                throw new FileNotFoundException("Файл не существует");
-            }
-
-            using (StreamReader sr = new StreamReader(filename))
-            {
-                string? str;
-                str = sr.ReadLine();
-                if (str != _collectionKey.ToString())
-                    throw new FormatException("В файле неверные данные");
-                _storages.Clear();
-                while ((str = sr.ReadLine()) != null)
-                {
-                    string[] record = str.Split(_separatorForKeyValue);
-                    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?.CreateDrawningArtilleryUnit() is T artilleryUnit)
-                        {
-                            try
-                            {
-                                if (collection.Insert(artilleryUnit, new DrawiningArtilleryUnitEqutables()) == -1)
-                                {
-                                    throw new InvalidOperationException("Объект не удалось добавить в коллекцию: " + record[3]);
-                                }
-                            }
-                            catch (CollectionOverflowException ex)
-                            {
-                                throw new CollectionOverflowException("Коллекция переполнена", 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/ArtilleryUnit/ArtilleryUnit/CruiserDelegate.cs
+++ b/ArtilleryUnit/ArtilleryUnit/CruiserDelegate.cs
@@ -1,10 +0,0 @@
-using ProjectArtilleryUnit.Drawnings;
-
-namespace ProjectArtilleryUnit;
-
-/// <summary>
-/// Делегат передачи объекта класса-прорисвоки
-/// </summary>
-/// <param name="artilleryUnit"></param>
-public delegate void ArtilleryUnitDelegate(DrawningArtilleryUnit artilleryUnit);
-
--- a/ArtilleryUnit/ArtilleryUnit/Drawnings/DrawiningArtilleryUnitEqutables.cs
+++ b/ArtilleryUnit/ArtilleryUnit/Drawnings/DrawiningArtilleryUnitEqutables.cs
@@ -1,54 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-
-namespace ProjectArtilleryUnit.Drawnings;
-
-/// <summary>
-/// Реализация сравнения двух объектов класса-прорисовки
-/// </summary>
-public class DrawiningArtilleryUnitEqutables : IEqualityComparer<DrawningArtilleryUnit?>
-{
-    public bool Equals(DrawningArtilleryUnit? x, DrawningArtilleryUnit? y)
-    {
-        if (x == null || x.EntityArtilleryUnit == null)
-        {
-            return false;
-        }
-
-        if (y == null || y.EntityArtilleryUnit == null)
-        {
-            return false;
-        }
-
-        if (x.GetType().Name != y.GetType().Name)
-        {
-            return false;
-        }
-
-        if (x.EntityArtilleryUnit.Speed != y.EntityArtilleryUnit.Speed)
-        {
-            return false;
-        }
-
-        if (x.EntityArtilleryUnit.Weight != y.EntityArtilleryUnit.Weight)
-        {
-            return false;
-        }
-
-        if (x.EntityArtilleryUnit.BodyColor != y.EntityArtilleryUnit.BodyColor)
-        {
-            return false;
-        }
-
-        if (x is DrawningMilitaryArtilleryUnit && y is DrawningMilitaryArtilleryUnit)
-        {
-            // TODO доделать логику сравнения дополнительных параметров
-        }
-
-        return true;
-    }
-
-    public int GetHashCode([DisallowNull] DrawningArtilleryUnit obj)
-    {
-        return obj.GetHashCode();
-    }
-}
--- a/ArtilleryUnit/ArtilleryUnit/Drawnings/DrawningArtilleryUnit.cs
+++ b/ArtilleryUnit/ArtilleryUnit/Drawnings/DrawningArtilleryUnit.cs
@@ -1,4 +1,5 @@
 using ProjectArtilleryUnit.Entities;
+using System.Drawing;

 namespace ProjectArtilleryUnit.Drawnings;
 /// <summary>
@@ -19,20 +20,20 @@ public class DrawningArtilleryUnit
    /// </summary>
    private int? _pictureHeight;
    /// <summary>
-    /// Левая координата прорисовки артиллерийской установки
+    /// Левая координата прорисовки автомобиля
    /// </summary>
    protected int? _startPosX;
    /// <summary>
-    /// Верхняя кооридната прорисовки артиллерийской установки
+    /// Верхняя кооридната прорисовки автомобиля
    /// </summary>
    protected int? _startPosY;

    /// <summary>
-    /// Ширина прорисовки артиллерийской установки
+    /// Ширина прорисовки танка
    /// </summary>
    private readonly int _drawningArtilleryUnitWidth = 150;
    /// <summary>
-    /// Высота прорисовки артиллерийской установки 
+    /// Высота прорисовки танка 
    /// </summary>
    private readonly int _drawningArtilleryUnitHeight = 50;
    private readonly int _drawningEnginesWidth = 3;
@@ -57,7 +58,7 @@ public class DrawningArtilleryUnit
    /// <summary>
    /// Пустой онструктор
    /// </summary>
-    public DrawningArtilleryUnit()
+    private DrawningArtilleryUnit()
    {
        _pictureWidth = null;
        _pictureHeight = null;
@@ -86,15 +87,6 @@ public class DrawningArtilleryUnit
        _pictureHeight = drawningCarHeight;
    }

-    /// <summary>
-    /// конструктор
-    /// </summary>
-    /// <param name="entityArtilleryUnit"></param>
-    public DrawningArtilleryUnit(EntityArtilleryUnit entityArtilleryUnit)
-    {
-        EntityArtilleryUnit = entityArtilleryUnit;
-    }
-
    /// <summary>
    /// Установка границ поля
    /// </summary>
@@ -192,7 +184,6 @@ public class DrawningArtilleryUnit
                return false;
        }
    }
-
    /// <summary>
    /// Прорисовка объекта
    /// </summary>
--- a/ArtilleryUnit/ArtilleryUnit/Drawnings/DrawningArtilleryUnitCompareByColor.cs
+++ b/ArtilleryUnit/ArtilleryUnit/Drawnings/DrawningArtilleryUnitCompareByColor.cs
@@ -1,34 +0,0 @@
-using ProjectArtilleryUnit.Entities;
-
-namespace ProjectArtilleryUnit.Drawnings;
-
-/// <summary>
-/// Сравнение по цвету, скорости, весу
-/// </summary>
-public class DrawningArtilleryUnitCompareByColor : IComparer<DrawningArtilleryUnit?>
-{
-    public int Compare(DrawningArtilleryUnit? x, DrawningArtilleryUnit? y)
-    {
-        // TODO прописать логику сравения по цветам, скорости, весу
-        if (x == null || x.EntityArtilleryUnit == null)
-        {
-            return 1;
-        }
-
-        if (y == null || y.EntityArtilleryUnit == null)
-        {
-            return -1;
-        }
-        var bodycolorCompare = x.EntityArtilleryUnit.BodyColor.Name.CompareTo(y.EntityArtilleryUnit.BodyColor.Name);
-        if (bodycolorCompare != 0)
-        {
-            return bodycolorCompare;
-        }
-        var speedCompare = x.EntityArtilleryUnit.Speed.CompareTo(y.EntityArtilleryUnit.Speed);
-        if (speedCompare != 0)
-        {
-            return speedCompare;
-        }
-        return x.EntityArtilleryUnit.Weight.CompareTo(y.EntityArtilleryUnit.Weight);
-    }
-}
--- a/ArtilleryUnit/ArtilleryUnit/Drawnings/DrawningArtilleryUnitCompareByType.cs
+++ b/ArtilleryUnit/ArtilleryUnit/Drawnings/DrawningArtilleryUnitCompareByType.cs
@@ -1,35 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectArtilleryUnit.Drawnings;
-
-/// <summary>
-/// Сравнение по типу, скорости, весу
-/// </summary>
-public class DrawningArtilleryUnitCompareByType : IComparer<DrawningArtilleryUnit?>
-{
-    public int Compare(DrawningArtilleryUnit? x, DrawningArtilleryUnit? y)
-    {
-        if (x == null || x.EntityArtilleryUnit == null)
-        {
-            return 1;
-        }
-        if (y == null || y.EntityArtilleryUnit == null)
-        {
-            return -1;
-        }
-        if (x.GetType().Name != y.GetType().Name)
-        {
-            return x.GetType().Name.CompareTo(y.GetType().Name);
-        }
-        var speedCompare = x.EntityArtilleryUnit.Speed.CompareTo(y.EntityArtilleryUnit.Speed);
-        if (speedCompare != 0)
-        {
-            return speedCompare;
-        }
-        return x.EntityArtilleryUnit.Weight.CompareTo(y.EntityArtilleryUnit.Weight);
-    }
-}
--- a/ArtilleryUnit/ArtilleryUnit/Drawnings/DrawningMilitaryArtilleryUnit.cs
+++ b/ArtilleryUnit/ArtilleryUnit/Drawnings/DrawningMilitaryArtilleryUnit.cs
@@ -1,10 +1,12 @@
-using System.Drawing.Drawing2D;
+using System.Drawing;
+using System.Drawing.Drawing2D;
 using ProjectArtilleryUnit.Entities;

 namespace ProjectArtilleryUnit.Drawnings
 {
    public class DrawningMilitaryArtilleryUnit : DrawningArtilleryUnit
    {
+
        /// <summary>
        /// Конструктор
        /// </summary>
@@ -22,14 +24,6 @@ namespace ProjectArtilleryUnit.Drawnings
            EntityArtilleryUnit = new EntityMilitaryArtilleryUnit(speed, weight, bodyColor, additionalColor, muzzle, gun, luke);
        }

-        public DrawningMilitaryArtilleryUnit(EntityArtilleryUnit entityArtilleryUnit)
-        {
-            if (entityArtilleryUnit != null)
-            {
-                EntityArtilleryUnit = entityArtilleryUnit;
-            }
-        }
-
        public override void DrawTransport(Graphics g)
        {
            if (EntityArtilleryUnit == null || EntityArtilleryUnit is not EntityMilitaryArtilleryUnit entityMilitaryArtilleryUnit || !_startPosX.HasValue ||
@@ -37,7 +31,6 @@ namespace ProjectArtilleryUnit.Drawnings
            {
                return;
            }
-
            Pen pen = new(entityMilitaryArtilleryUnit.AdditionalColor, 2);
            Pen pen2 = new(Color.Black, 2);
            Pen pen3 = new(Color.Red, 4);
@@ -70,6 +63,7 @@ namespace ProjectArtilleryUnit.Drawnings
                g.DrawRectangle(pen, _startPosX.Value + 60, _startPosY.Value + 4, 25, 2);
            }

+             
        }
    }
 }
--- a/ArtilleryUnit/ArtilleryUnit/Drawnings/ExtentionDrawningArtilleryUnit.cs
+++ b/ArtilleryUnit/ArtilleryUnit/Drawnings/ExtentionDrawningArtilleryUnit.cs
@@ -1,50 +0,0 @@
-using ProjectArtilleryUnit.Entities;
-
-namespace ProjectArtilleryUnit.Drawnings
-{
-    public static class ExtentionDrawningArtilleryUnit
-    {
-        /// <summary>
-        /// Разделитель для записи информации по объекту в файл
-        /// </summary>
-        private static readonly string _separatorForObject = ":";
-
-        /// <summary>
-        /// Создание объекта из строки
-        /// </summary>
-        /// <param name="info">Строка с данными для создания объекта</param>
-        /// <returns>Объект</returns>
-        public static DrawningArtilleryUnit? CreateDrawningArtilleryUnit(this string info)
-        {
-            string[] strs = info.Split(_separatorForObject);
-            EntityArtilleryUnit? artilleryUnit = EntityMilitaryArtilleryUnit.CreateEntityMilitaryArtilleryUnit(strs);
-            if (artilleryUnit != null)
-            {
-                return new DrawningMilitaryArtilleryUnit(artilleryUnit);
-            }
-
-            artilleryUnit = EntityArtilleryUnit.CreateEntityArtilleryUnit(strs);
-            if (artilleryUnit != null)
-            {
-                return new DrawningArtilleryUnit(artilleryUnit);
-            }
-            return null;
-        }
-
-        /// <summary>
-        /// Получение данных для сохранения в файл
-        /// </summary>
-        /// <param name="drawning ArtilleryUnit">Сохраняемый объект</param>
-        /// <returns>Строка с данными по объекту</returns>
-        public static string GetDataForSave(this DrawningArtilleryUnit drawningArtilleryUnit)
-        {
-            string[]? array = drawningArtilleryUnit?.EntityArtilleryUnit?.GetStringRepresentation();
-            if (array == null)
-            {
-                return string.Empty;
-            }
-            return string.Join(_separatorForObject, array);
-        }
-
-    }
-}
--- a/ArtilleryUnit/ArtilleryUnit/Entities/EntityArtilleryUnit.cs
+++ b/ArtilleryUnit/ArtilleryUnit/Entities/EntityArtilleryUnit.cs
@@ -0,0 +1,38 @@
+namespace ProjectArtilleryUnit.Entities;
+
+/// <summary>
+/// Класс-сущность "танк"
+/// </summary>
+public class EntityArtilleryUnit
+{
+    //свойства
+    /// <summary>
+    /// Скорость
+    /// </summary>
+    public int Speed { get; private set; }
+    /// <summary>
+    /// Вес
+    /// </summary>
+    public double Weight { get; private set; }
+    /// <summary>
+    /// Основной цвет
+    /// </summary>
+    public Color BodyColor { get; private set; }
+
+    /// <summary>
+    /// Шаг перемещения автомобиля
+    /// </summary>
+    public double Step => Speed * 100 / Weight;
+    /// <summary>
+    /// Инициализация полей объекта-класса танка
+    /// </summary>
+    /// <param name="speed">скорость</param>
+    /// <param name="weight">вес</param>
+    /// <param name="bodyColor">основной цвет</param>    
+    public EntityArtilleryUnit(int speed, double weight, Color bodyColor)
+    {
+        Speed = speed;
+        Weight = weight;
+        BodyColor = bodyColor;
+    }
+}
--- a/ArtilleryUnit/ArtilleryUnit/Entities/EntityCruiser.cs
+++ b/ArtilleryUnit/ArtilleryUnit/Entities/EntityCruiser.cs
@@ -1,69 +0,0 @@
-namespace ProjectArtilleryUnit.Entities;
-
-/// <summary>
-/// Класс-сущность "артиллерийская установка"
-/// </summary>
-public class EntityArtilleryUnit
-{
-    //свойства
-    /// <summary>
-    /// Скорость
-    /// </summary>
-    public int Speed { get; private set; }
-
-    /// <summary>
-    /// Вес
-    /// </summary>
-    public double Weight { get; private set; }
-
-    /// <summary>
-    /// Основной цвет
-    /// </summary>
-    public Color BodyColor { get; private set; }
-    public void setBodyColor(Color color)
-    {
-        BodyColor = color;
-    }
-
-    /// <summary>
-    /// Шаг перемещения автомобиля
-    /// </summary>
-    public double Step => Speed * 100 / Weight;
-
-    /// <summary>
-    /// Инициализация полей объекта-класса артиллерийской установки
-    /// </summary>
-    /// <param name="speed">скорость</param>
-    /// <param name="weight">вес</param>
-    /// <param name="bodyColor">основной цвет</param>    
-    public EntityArtilleryUnit(int speed, double weight, Color bodyColor)
-    {
-        Speed = speed;
-        Weight = weight;
-        BodyColor = bodyColor;
-    }
-
-    /// <summary>
-    /// Получение строк со значениями свойств объекта класса-сущности
-    /// </summary>
-    /// <returns></returns>
-    public virtual string[] GetStringRepresentation()
-    {
-        return new[] { nameof(EntityArtilleryUnit), Speed.ToString(), Weight.ToString(), BodyColor.Name };
-    }
-
-    /// <summary>
-    /// Создание объекта из массива строк
-    /// </summary>
-    /// <param name="strs"></param>
-    /// <returns></returns>
-    public static EntityArtilleryUnit? CreateEntityArtilleryUnit(string[] strs)
-    {
-        if (strs.Length != 4 || strs[0] != nameof(EntityArtilleryUnit))
-        {
-            return null;
-        }
-
-        return new EntityArtilleryUnit(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]));
-    }
-}
--- a/ArtilleryUnit/ArtilleryUnit/Entities/EntityMilitaryArtilleryUnit.cs
+++ b/ArtilleryUnit/ArtilleryUnit/Entities/EntityMilitaryArtilleryUnit.cs
@@ -0,0 +1,30 @@
+namespace ProjectArtilleryUnit.Entities
+{
+    internal class EntityMilitaryArtilleryUnit : EntityArtilleryUnit
+    {
+        /// <summary>
+        /// Признак (опция) наличие пушка
+        /// </summary>
+        public bool Muzzle { get; private set; }
+        /// <summary>
+        /// Признак (опция) наличие артелирийской пушки
+        /// </summary>
+        public bool Gun { get; private set; }
+        /// <summary>
+        /// Признак (опция) наличие люка
+        /// </summary>
+        public bool Luke { get; private set; }
+        /// <summary>
+        /// Дополнительный цвет (для опциональных элементов)
+        /// </summary>
+        public Color AdditionalColor { get; private set; }
+
+        public EntityMilitaryArtilleryUnit(int speed, double weight, Color bodyColor, Color additionalColor, bool мuzzle, bool gun, bool luke) : base(speed, weight, bodyColor)
+        {
+            AdditionalColor = additionalColor;
+            Muzzle = мuzzle;
+            Gun = gun;
+            Luke = luke;
+        }
+    }
+}
--- a/ArtilleryUnit/ArtilleryUnit/Entities/EntityMilitaryCruiser.cs
+++ b/ArtilleryUnit/ArtilleryUnit/Entities/EntityMilitaryCruiser.cs
@@ -1,62 +0,0 @@
-namespace ProjectArtilleryUnit.Entities
-{
-    internal class EntityMilitaryArtilleryUnit : EntityArtilleryUnit
-    {
-        /// <summary>
-        /// Признак (опция) наличие дула
-        /// </summary>
-        public bool Muzzle { get; private set; }
-
-        /// <summary>
-        /// Признак (опция) наличие ракетной установки
-        /// </summary>
-        public bool Gun { get; private set; }
-
-        /// <summary>
-        /// Признак (опция) наличие люка
-        /// </summary>
-        public bool Luke { get; private set; }
-
-        /// <summary>
-        /// Дополнительный цвет (для опциональных элементов)
-        /// </summary>
-        public Color AdditionalColor { get; private set; }
-        public void setAdditionalColor(Color color)
-        {
-            AdditionalColor = color;
-        }
-
-        public EntityMilitaryArtilleryUnit(int speed, double weight, Color bodyColor, Color additionalColor, bool muzzle, bool gun, bool luke) : base(speed, weight, bodyColor)
-        {
-            AdditionalColor = additionalColor;
-            Muzzle = muzzle;
-            Gun = gun;
-            Luke = luke;
-        }
-
-        /// <summary>
-        /// Получение строк со значениями свойств объекта класса-сущности
-        /// </summary>
-        /// <returns></returns>
-        public override string[] GetStringRepresentation()
-        {
-            return new[] { nameof(EntityArtilleryUnit), Speed.ToString(), Weight.ToString(), BodyColor.Name, AdditionalColor.Name,
-            Muzzle.ToString(), Gun.ToString(), Luke.ToString() };
-        }
-
-        /// <summary>
-        /// Создание объекта из массива строк
-        /// </summary>
-        /// <param name="strs"></param>
-        /// <returns></returns>
-        public static EntityArtilleryUnit? CreateEntityMilitaryArtilleryUnit(string[] strs)
-        {
-            if (strs.Length != 8 || strs[0] != nameof(EntityArtilleryUnit))
-            {
-                return null;
-            }
-            return new EntityMilitaryArtilleryUnit(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/ArtilleryUnit/ArtilleryUnit/Exceptions/CollectionOverflowException.cs
+++ b/ArtilleryUnit/ArtilleryUnit/Exceptions/CollectionOverflowException.cs
@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Serialization;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectArtilleryUnit.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/ArtilleryUnit/ArtilleryUnit/Exceptions/ObjectAlreadyInCollectionException.cs
+++ b/ArtilleryUnit/ArtilleryUnit/Exceptions/ObjectAlreadyInCollectionException.cs
@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Serialization;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectArtilleryUnit.Exceptions;
-
-[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/ArtilleryUnit/ArtilleryUnit/Exceptions/ObjectNotFoundException.cs
+++ b/ArtilleryUnit/ArtilleryUnit/Exceptions/ObjectNotFoundException.cs
@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Serialization;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectArtilleryUnit.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/ArtilleryUnit/ArtilleryUnit/Exceptions/PositionOutOfCollectionException.cs
+++ b/ArtilleryUnit/ArtilleryUnit/Exceptions/PositionOutOfCollectionException.cs
@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Serialization;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectArtilleryUnit.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/ArtilleryUnit/ArtilleryUnit/FormArtilleryUnit.Designer.cs
+++ b/ArtilleryUnit/ArtilleryUnit/FormArtilleryUnit.Designer.cs
--- a/ArtilleryUnit/ArtilleryUnit/FormArtilleryUnit.cs
+++ b/ArtilleryUnit/ArtilleryUnit/FormArtilleryUnit.cs
@@ -41,7 +41,7 @@ namespace ProjectArtilleryUnit
        }

        /// <summary>
-        /// Метод прорисовки артиллерийской установки
+        /// Метод прорисовки танка
        /// </summary>
        private void Draw()
        {
--- a/ArtilleryUnit/ArtilleryUnit/FormArtilleryUnit.resx
+++ b/ArtilleryUnit/ArtilleryUnit/FormArtilleryUnit.resx
--- a/ArtilleryUnit/ArtilleryUnit/FormArtilleryUnitsCollection.Designer.cs
+++ b/ArtilleryUnit/ArtilleryUnit/FormArtilleryUnitsCollection.Designer.cs
@@ -40,25 +40,17 @@
            labelCollectionName = new Label();
            comboBoxSelectorCompany = new ComboBox();
            panelCompanyTools = new Panel();
-            buttonSortByColor = new Button();
-            buttonSortByType = new Button();
            ButtonAddArtilleryUnit = new Button();
+            ButtonAddMilitaryArtilleryUnit = new Button();
            buttonRefresh = new Button();
            ButtonRemoveArtilleryUnit = new Button();
            maskedTextBoxPosision = new MaskedTextBox();
            buttonGetToTest = new Button();
            pictureBoxArtilleryUnit = new PictureBox();
-            menuStrip = new MenuStrip();
-            файлToolStripMenuItem = new ToolStripMenuItem();
-            saveToolStripMenuItem = new ToolStripMenuItem();
-            loadToolStripMenuItem = new ToolStripMenuItem();
-            saveFileDialog = new SaveFileDialog();
-            openFileDialog = new OpenFileDialog();
            groupBoxTools.SuspendLayout();
            panelStorage.SuspendLayout();
            panelCompanyTools.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)pictureBoxArtilleryUnit).BeginInit();
-            menuStrip.SuspendLayout();
            SuspendLayout();
            // 
            // groupBoxTools
@@ -68,21 +60,22 @@
            groupBoxTools.Controls.Add(comboBoxSelectorCompany);
            groupBoxTools.Controls.Add(panelCompanyTools);
            groupBoxTools.Dock = DockStyle.Right;
-            groupBoxTools.Location = new Point(552, 24);
+            groupBoxTools.Location = new Point(531, 0);
            groupBoxTools.Margin = new Padding(3, 2, 3, 2);
            groupBoxTools.Name = "groupBoxTools";
            groupBoxTools.Padding = new Padding(3, 2, 3, 2);
-            groupBoxTools.Size = new Size(194, 492);
+            groupBoxTools.Size = new Size(260, 490);
            groupBoxTools.TabIndex = 0;
            groupBoxTools.TabStop = false;
            groupBoxTools.Text = "инструменты";
+            groupBoxTools.Enter += groupBoxTools_Enter;
            // 
            // buttonCreateCompany
            // 
-            buttonCreateCompany.Location = new Point(18, 259);
+            buttonCreateCompany.Location = new Point(6, 259);
            buttonCreateCompany.Margin = new Padding(3, 2, 3, 2);
            buttonCreateCompany.Name = "buttonCreateCompany";
-            buttonCreateCompany.Size = new Size(163, 20);
+            buttonCreateCompany.Size = new Size(245, 20);
            buttonCreateCompany.TabIndex = 7;
            buttonCreateCompany.Text = "Создать компанию";
            buttonCreateCompany.UseVisualStyleBackColor = true;
@@ -101,15 +94,15 @@
            panelStorage.Location = new Point(3, 18);
            panelStorage.Margin = new Padding(3, 2, 3, 2);
            panelStorage.Name = "panelStorage";
-            panelStorage.Size = new Size(188, 212);
+            panelStorage.Size = new Size(254, 212);
            panelStorage.TabIndex = 6;
            // 
            // buttonCollectionDel
            // 
-            buttonCollectionDel.Location = new Point(15, 185);
+            buttonCollectionDel.Location = new Point(3, 185);
            buttonCollectionDel.Margin = new Padding(3, 2, 3, 2);
            buttonCollectionDel.Name = "buttonCollectionDel";
-            buttonCollectionDel.Size = new Size(163, 20);
+            buttonCollectionDel.Size = new Size(245, 20);
            buttonCollectionDel.TabIndex = 6;
            buttonCollectionDel.Text = "Удалить коллекцию";
            buttonCollectionDel.UseVisualStyleBackColor = true;
@@ -119,18 +112,18 @@
            // 
            listBoxCollection.FormattingEnabled = true;
            listBoxCollection.ItemHeight = 15;
-            listBoxCollection.Location = new Point(15, 103);
+            listBoxCollection.Location = new Point(3, 103);
            listBoxCollection.Margin = new Padding(3, 2, 3, 2);
            listBoxCollection.Name = "listBoxCollection";
-            listBoxCollection.Size = new Size(163, 79);
+            listBoxCollection.Size = new Size(245, 79);
            listBoxCollection.TabIndex = 5;
            // 
            // buttonCollecctionAdd
            // 
-            buttonCollecctionAdd.Location = new Point(15, 78);
+            buttonCollecctionAdd.Location = new Point(3, 78);
            buttonCollecctionAdd.Margin = new Padding(3, 2, 3, 2);
            buttonCollecctionAdd.Name = "buttonCollecctionAdd";
-            buttonCollecctionAdd.Size = new Size(163, 20);
+            buttonCollecctionAdd.Size = new Size(245, 20);
            buttonCollecctionAdd.TabIndex = 4;
            buttonCollecctionAdd.Text = "Добавить коллекцию";
            buttonCollecctionAdd.UseVisualStyleBackColor = true;
@@ -162,11 +155,12 @@
            // 
            // textBoxCollectionName
            // 
-            textBoxCollectionName.Location = new Point(15, 24);
+            textBoxCollectionName.Location = new Point(3, 24);
            textBoxCollectionName.Margin = new Padding(3, 2, 3, 2);
            textBoxCollectionName.Name = "textBoxCollectionName";
-            textBoxCollectionName.Size = new Size(163, 23);
+            textBoxCollectionName.Size = new Size(245, 23);
            textBoxCollectionName.TabIndex = 1;
+            textBoxCollectionName.TextChanged += textBoxCollectionName_TextChanged;
            // 
            // labelCollectionName
            // 
@@ -182,18 +176,17 @@
            comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
            comboBoxSelectorCompany.FormattingEnabled = true;
            comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
-            comboBoxSelectorCompany.Location = new Point(18, 233);
+            comboBoxSelectorCompany.Location = new Point(6, 233);
            comboBoxSelectorCompany.Margin = new Padding(3, 2, 3, 2);
            comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
-            comboBoxSelectorCompany.Size = new Size(163, 23);
+            comboBoxSelectorCompany.Size = new Size(245, 23);
            comboBoxSelectorCompany.TabIndex = 0;
            comboBoxSelectorCompany.SelectedIndexChanged += comboBoxSelectorCompany_SelectedIndexChanged_1;
            // 
            // panelCompanyTools
            // 
-            panelCompanyTools.Controls.Add(buttonSortByColor);
-            panelCompanyTools.Controls.Add(buttonSortByType);
            panelCompanyTools.Controls.Add(ButtonAddArtilleryUnit);
+            panelCompanyTools.Controls.Add(ButtonAddMilitaryArtilleryUnit);
            panelCompanyTools.Controls.Add(buttonRefresh);
            panelCompanyTools.Controls.Add(ButtonRemoveArtilleryUnit);
            panelCompanyTools.Controls.Add(maskedTextBoxPosision);
@@ -202,53 +195,42 @@
            panelCompanyTools.Location = new Point(3, 284);
            panelCompanyTools.Margin = new Padding(3, 2, 3, 2);
            panelCompanyTools.Name = "panelCompanyTools";
-            panelCompanyTools.Size = new Size(189, 206);
+            panelCompanyTools.Size = new Size(251, 206);
            panelCompanyTools.TabIndex = 8;
-            // 
-            // buttonSortByColor
-            // 
-            buttonSortByColor.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonSortByColor.Location = new Point(17, 181);
-            buttonSortByColor.Margin = new Padding(3, 2, 3, 2);
-            buttonSortByColor.Name = "buttonSortByColor";
-            buttonSortByColor.Size = new Size(163, 23);
-            buttonSortByColor.TabIndex = 7;
-            buttonSortByColor.Text = "Сортировка по цвету";
-            buttonSortByColor.UseVisualStyleBackColor = true;
-            buttonSortByColor.Click += ButtonSortByColor_Click;
-            // 
-            // buttonSortByType
-            // 
-            buttonSortByType.Anchor = AnchorStyles.Right;
-            buttonSortByType.Location = new Point(17, 149);
-            buttonSortByType.Margin = new Padding(3, 2, 3, 2);
-            buttonSortByType.Name = "buttonSortByType";
-            buttonSortByType.Size = new Size(163, 28);
-            buttonSortByType.TabIndex = 6;
-            buttonSortByType.Text = "Сортировка по типу";
-            buttonSortByType.UseVisualStyleBackColor = true;
-            buttonSortByType.Click += ButtonSortByType_Click;
+            panelCompanyTools.Paint += panelCompanyTools_Paint;
            // 
            // ButtonAddArtilleryUnit
            // 
            ButtonAddArtilleryUnit.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
            ButtonAddArtilleryUnit.BackgroundImageLayout = ImageLayout.Center;
-            ButtonAddArtilleryUnit.Location = new Point(16, 2);
+            ButtonAddArtilleryUnit.Location = new Point(3, 2);
            ButtonAddArtilleryUnit.Margin = new Padding(3, 2, 3, 2);
            ButtonAddArtilleryUnit.Name = "ButtonAddArtilleryUnit";
-            ButtonAddArtilleryUnit.Size = new Size(163, 39);
+            ButtonAddArtilleryUnit.Size = new Size(245, 30);
            ButtonAddArtilleryUnit.TabIndex = 1;
            ButtonAddArtilleryUnit.Text = "добваление артиллерийской установки";
            ButtonAddArtilleryUnit.UseVisualStyleBackColor = true;
            ButtonAddArtilleryUnit.Click += ButtonAddArtilleryUnit_Click;
            // 
+            // ButtonAddMilitaryArtilleryUnit
+            // 
+            ButtonAddMilitaryArtilleryUnit.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            ButtonAddMilitaryArtilleryUnit.Location = new Point(3, 37);
+            ButtonAddMilitaryArtilleryUnit.Margin = new Padding(3, 2, 3, 2);
+            ButtonAddMilitaryArtilleryUnit.Name = "ButtonAddMilitaryArtilleryUnit";
+            ButtonAddMilitaryArtilleryUnit.Size = new Size(245, 38);
+            ButtonAddMilitaryArtilleryUnit.TabIndex = 2;
+            ButtonAddMilitaryArtilleryUnit.Text = "добваление военной артиллерийской установки";
+            ButtonAddMilitaryArtilleryUnit.UseVisualStyleBackColor = true;
+            ButtonAddMilitaryArtilleryUnit.Click += ButtonAddMilitaryArtilleryUnit_Click;
+            // 
            // buttonRefresh
            // 
            buttonRefresh.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonRefresh.Location = new Point(17, 123);
+            buttonRefresh.Location = new Point(3, 170);
            buttonRefresh.Margin = new Padding(3, 2, 3, 2);
            buttonRefresh.Name = "buttonRefresh";
-            buttonRefresh.Size = new Size(163, 22);
+            buttonRefresh.Size = new Size(245, 31);
            buttonRefresh.TabIndex = 5;
            buttonRefresh.Text = "обновить";
            buttonRefresh.UseVisualStyleBackColor = true;
@@ -257,32 +239,32 @@
            // ButtonRemoveArtilleryUnit
            // 
            ButtonRemoveArtilleryUnit.Anchor = AnchorStyles.Right;
-            ButtonRemoveArtilleryUnit.Location = new Point(17, 74);
+            ButtonRemoveArtilleryUnit.Location = new Point(3, 104);
            ButtonRemoveArtilleryUnit.Margin = new Padding(3, 2, 3, 2);
            ButtonRemoveArtilleryUnit.Name = "ButtonRemoveArtilleryUnit";
-            ButtonRemoveArtilleryUnit.Size = new Size(163, 21);
+            ButtonRemoveArtilleryUnit.Size = new Size(245, 30);
            ButtonRemoveArtilleryUnit.TabIndex = 3;
-            ButtonRemoveArtilleryUnit.Text = "удалить установку";
+            ButtonRemoveArtilleryUnit.Text = "удалить артиллерийскую установку";
            ButtonRemoveArtilleryUnit.UseVisualStyleBackColor = true;
            ButtonRemoveArtilleryUnit.Click += ButtonRemoveArtilleryUnit_Click;
            // 
            // maskedTextBoxPosision
            // 
-            maskedTextBoxPosision.Location = new Point(16, 45);
+            maskedTextBoxPosision.Location = new Point(3, 79);
            maskedTextBoxPosision.Margin = new Padding(3, 2, 3, 2);
            maskedTextBoxPosision.Mask = "00";
            maskedTextBoxPosision.Name = "maskedTextBoxPosision";
-            maskedTextBoxPosision.Size = new Size(164, 23);
+            maskedTextBoxPosision.Size = new Size(245, 23);
            maskedTextBoxPosision.TabIndex = 2;
            maskedTextBoxPosision.ValidatingType = typeof(int);
            // 
            // buttonGetToTest
            // 
            buttonGetToTest.Anchor = AnchorStyles.Right;
-            buttonGetToTest.Location = new Point(16, 99);
+            buttonGetToTest.Location = new Point(3, 138);
            buttonGetToTest.Margin = new Padding(3, 2, 3, 2);
            buttonGetToTest.Name = "buttonGetToTest";
-            buttonGetToTest.Size = new Size(163, 20);
+            buttonGetToTest.Size = new Size(245, 30);
            buttonGetToTest.TabIndex = 4;
            buttonGetToTest.Text = "передать на тесты";
            buttonGetToTest.UseVisualStyleBackColor = true;
@@ -291,64 +273,21 @@
            // pictureBoxArtilleryUnit
            // 
            pictureBoxArtilleryUnit.Dock = DockStyle.Fill;
-            pictureBoxArtilleryUnit.Location = new Point(0, 24);
+            pictureBoxArtilleryUnit.Location = new Point(0, 0);
            pictureBoxArtilleryUnit.Margin = new Padding(3, 2, 3, 2);
            pictureBoxArtilleryUnit.Name = "pictureBoxArtilleryUnit";
-            pictureBoxArtilleryUnit.Size = new Size(552, 492);
+            pictureBoxArtilleryUnit.Size = new Size(531, 490);
            pictureBoxArtilleryUnit.TabIndex = 1;
            pictureBoxArtilleryUnit.TabStop = false;
-            // 
-            // menuStrip
-            // 
-            menuStrip.ImageScalingSize = new Size(20, 20);
-            menuStrip.Items.AddRange(new ToolStripItem[] { файлToolStripMenuItem });
-            menuStrip.Location = new Point(0, 0);
-            menuStrip.Name = "menuStrip";
-            menuStrip.Padding = new Padding(5, 2, 0, 2);
-            menuStrip.Size = new Size(746, 24);
-            menuStrip.TabIndex = 2;
-            menuStrip.Text = "menuStrip1";
-            // 
-            // файлToolStripMenuItem
-            // 
-            файлToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { saveToolStripMenuItem, loadToolStripMenuItem });
-            файлToolStripMenuItem.Name = "файлToolStripMenuItem";
-            файлToolStripMenuItem.Size = new Size(48, 20);
-            файлToolStripMenuItem.Text = "Файл";
-            // 
-            // saveToolStripMenuItem
-            // 
-            saveToolStripMenuItem.Name = "saveToolStripMenuItem";
-            saveToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.S;
-            saveToolStripMenuItem.Size = new Size(181, 22);
-            saveToolStripMenuItem.Text = "Сохранение";
-            saveToolStripMenuItem.Click += SaveToolStripMenuItem_Click;
-            // 
-            // loadToolStripMenuItem
-            // 
-            loadToolStripMenuItem.Name = "loadToolStripMenuItem";
-            loadToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.L;
-            loadToolStripMenuItem.Size = new Size(181, 22);
-            loadToolStripMenuItem.Text = "Загрузка";
-            loadToolStripMenuItem.Click += LoadToolStripMenuItem_Click;
-            // 
-            // saveFileDialog
-            // 
-            saveFileDialog.Filter = "txt file|*.txt";
-            // 
-            // openFileDialog
-            // 
-            openFileDialog.Filter = "txt file|*.txt";
+            pictureBoxArtilleryUnit.Click += pictureBoxArtilleryUnit_Click;
            // 
            // FormArtilleryUnitsCollection
            // 
            AutoScaleDimensions = new SizeF(7F, 15F);
            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(746, 516);
+            ClientSize = new Size(791, 490);
            Controls.Add(pictureBoxArtilleryUnit);
            Controls.Add(groupBoxTools);
-            Controls.Add(menuStrip);
-            MainMenuStrip = menuStrip;
            Margin = new Padding(3, 2, 3, 2);
            Name = "FormArtilleryUnitsCollection";
            Text = "FormArtilleryUnitsCollection";
@@ -359,16 +298,14 @@
            panelCompanyTools.ResumeLayout(false);
            panelCompanyTools.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)pictureBoxArtilleryUnit).EndInit();
-            menuStrip.ResumeLayout(false);
-            menuStrip.PerformLayout();
            ResumeLayout(false);
-            PerformLayout();
        }

        #endregion

        private GroupBox groupBoxTools;
        private ComboBox comboBoxSelectorCompany;
+        private Button ButtonAddMilitaryArtilleryUnit;
        private Button ButtonAddArtilleryUnit;
        private Button ButtonRemoveArtilleryUnit;
        private Button buttonRefresh;
@@ -385,13 +322,5 @@
        private Button buttonCreateCompany;
        private Button buttonCollectionDel;
        private Panel panelCompanyTools;
-        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/ArtilleryUnit/ArtilleryUnit/FormArtilleryUnitsCollection.cs
+++ b/ArtilleryUnit/ArtilleryUnit/FormArtilleryUnitsCollection.cs
@@ -1,7 +1,5 @@
-using Microsoft.Extensions.Logging;
-using ProjectArtilleryUnit.CollectionGenericObjects;
+using ProjectArtilleryUnit.CollectionGenericObjects;
 using ProjectArtilleryUnit.Drawnings;
-using System.Windows.Forms;

 namespace ProjectArtilleryUnit
 {
@@ -17,19 +15,13 @@ namespace ProjectArtilleryUnit
        /// </summary>
        private AbstractCompany? _company = null;

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

        /// <summary>
@@ -43,49 +35,72 @@ namespace ProjectArtilleryUnit
        }

        /// <summary>
-        /// добавление артиллерийской установки
+        /// Создание объекта класса-перемещения
        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonAddArtilleryUnit_Click(object sender, EventArgs e)
+        /// <param name="type">Тип создаваемого объекта</param>
+        private void CreateObject(string type)
        {
-            FormArtilleryUnitConfing form = new();
-            // TODO передать метод
-
-            form.Show();
-            form.AddEvent(SetArtilleryUnit);
-        }
-
-        /// <summary>
-        /// Добавление артиллерийской установки в коллекцию
-        /// </summary>
-        /// <param name="artilleryUnit"></param>
-        private void SetArtilleryUnit(DrawningArtilleryUnit? artilleryUnit)
-        {
-            if (_company == null || artilleryUnit == null)
+            if (_company == null)
            {
                return;
            }
-            try
+            Random random = new();
+            DrawningArtilleryUnit drawningArtilleryUnit;
+            switch (type)
+            {
+                case nameof(DrawningArtilleryUnit):
+                    drawningArtilleryUnit = new DrawningArtilleryUnit(random.Next(100, 300), random.Next(1000, 3000), GetColor(random));
+                    break;
+                case nameof(DrawningMilitaryArtilleryUnit):
+                    // TODO вызов диалогового окна для выбора цвета
+                    drawningArtilleryUnit = new DrawningMilitaryArtilleryUnit(random.Next(100, 300), random.Next(1000, 3000),
+                    GetColor(random), GetColor(random),
+                    Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
+                    break;
+                default:
+                    return;
+            }
+            if (_company + drawningArtilleryUnit != -1)
            {
-                var res = _company + artilleryUnit;
                MessageBox.Show("Объект добавлен");
-                _logger.LogInformation($"Объект добавлен под индексом {res}");
                pictureBoxArtilleryUnit.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>
+        /// <param name="random">Генератор случайных чисел</param>
+        /// <returns></returns>
+        private static Color GetColor(Random random)
+        {
+            Color color = Color.FromArgb(random.Next(0, 256), random.Next(0,
+            256), random.Next(0, 256));
+            ColorDialog dialog = new();
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                color = dialog.Color;
+            }
+            return color;
+        }
+
+        //private void ButtonAddArtilleryUnit_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningArtilleryUnit));
+
+        //private void ButtonAddMilitaryArtilleryUnit_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningMilitaryArtilleryUnit));
+        private void ButtonAddArtilleryUnit_Click(object sender, EventArgs e)
+        {
+            CreateObject(nameof(DrawningArtilleryUnit));
+        }
+
+        private void ButtonAddMilitaryArtilleryUnit_Click(object sender, EventArgs e)
+        {
+            CreateObject(nameof(DrawningMilitaryArtilleryUnit));
+        }
+
        private void ButtonRemoveArtilleryUnit_Click(object sender, EventArgs e)
        {
            if (string.IsNullOrEmpty(maskedTextBoxPosision.Text) || _company == null)
@@ -98,18 +113,14 @@ namespace ProjectArtilleryUnit
                return;
            }
            int pos = Convert.ToInt32(maskedTextBoxPosision.Text);
-            try
+            if (_company - pos != null)
            {
-                var res = _company - pos;
-                MessageBox.Show("Объект удален");
-                _logger.LogInformation($"Объект удален под индексом {pos}");
+                MessageBox.Show("объект удален");
                pictureBoxArtilleryUnit.Image = _company.Show();
            }
-            catch (Exception ex)
+            else
            {
-                MessageBox.Show(ex.Message, "Не удалось удалить объект",
-                    MessageBoxButtons.OK, MessageBoxIcon.Error);
-                _logger.LogError($"Ошибка: {ex.Message}", ex.Message);
+                MessageBox.Show("не удалось удалить объект");
            }
        }

@@ -162,7 +173,8 @@ namespace ProjectArtilleryUnit
        {
            if (string.IsNullOrEmpty(textBoxCollectionName.Text) || (!radioButtonList.Checked && !radioButtonMassive.Checked))
            {
-                MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                MessageBox.Show("Не все данные заполнены", "Ошибка",
+                MessageBoxButtons.OK, MessageBoxIcon.Error);
                return;
            }
            CollectionType collectionType = CollectionType.None;
@@ -174,11 +186,7 @@ namespace ProjectArtilleryUnit
            {
                collectionType = CollectionType.List;
            }
-
-            CollectionInfo collectionInfo = new CollectionInfo(textBoxCollectionName.Text, collectionType, string.Empty);
-
-            _storageCollection.AddCollection(collectionInfo);
-            _logger.LogInformation("Добавление коллекции");
+            _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
            RerfreshListBoxItems();
        }

@@ -198,11 +206,7 @@ namespace ProjectArtilleryUnit
            {
                return;
            }
-
-            CollectionInfo collectionInfo = new CollectionInfo(listBoxCollection.SelectedItem.ToString(), CollectionType.None, string.Empty);
-
-            _storageCollection.DelCollection(collectionInfo);
-            _logger.LogInformation("Коллекция удалена");
+            _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
            RerfreshListBoxItems();
        }

@@ -214,7 +218,7 @@ namespace ProjectArtilleryUnit
            listBoxCollection.Items.Clear();
            for (int i = 0; i < _storageCollection.Keys?.Count; ++i)
            {
-                string? colName = _storageCollection.Keys?[i].Name;
+                string? colName = _storageCollection.Keys?[i];
                if (!string.IsNullOrEmpty(colName))
                {
                    listBoxCollection.Items.Add(colName);
@@ -223,7 +227,7 @@ namespace ProjectArtilleryUnit
        }

        /// <summary>
-        /// Создание компании
+        /// 
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
@@ -234,111 +238,46 @@ namespace ProjectArtilleryUnit
                MessageBox.Show("Коллекция не выбрана");
                return;
            }
-
-            CollectionInfo collectionInfo = new CollectionInfo(listBoxCollection.SelectedItem.ToString(), CollectionType.None, string.Empty);
-            ICollectionGenericObjects<DrawningArtilleryUnit>? collection = _storageCollection[collectionInfo];
+            ICollectionGenericObjects<DrawningArtilleryUnit>? collection =
+                _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
            if (collection == null)
            {
                MessageBox.Show("Коллекция не проинициализирована");
                return;
            }
-
            switch (comboBoxSelectorCompany.Text)
            {
                case "Хранилище":
                    _company = new ArtilleryUnitDockingService(pictureBoxArtilleryUnit.Width, pictureBoxArtilleryUnit.Height, collection);
-                    _logger.LogInformation("Компания создана");
                    break;
            }
            panelCompanyTools.Enabled = true;
-            RerfreshListBoxItems();

        }

-        /// <summary>
-        /// Обработка нажатия "Сохранение"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void SaveToolStripMenuItem_Click(object sender, EventArgs e)
+        private void pictureBoxArtilleryUnit_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);
-                    RerfreshListBoxItems();
-                    MessageBox.Show("Загрузка прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                    _logger.LogInformation("Загрузка из файла: {filename}", openFileDialog.FileName);
-                }
-                catch (Exception ex)
-                {
-                    MessageBox.Show("Загрузка не выполнена", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    _logger.LogError("Ошибка: {Message}", ex.Message);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Сортировка по типу
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonSortByType_Click(object sender, EventArgs e)
-        {
-            CompareArtilleryUnits(new DrawningArtilleryUnitCompareByType());
-        }
-
-        /// <summary>
-        /// Сортировка по цвету
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonSortByColor_Click(object sender, EventArgs e)
-        {
-            CompareArtilleryUnits(new DrawningArtilleryUnitCompareByColor());
-        }
-
-        /// <summary>
-        /// Сортировка по сравнителю
-        /// </summary>
-        /// <param name="comparer">Сравнитель объектов</param>
-        private void CompareArtilleryUnits(IComparer<DrawningArtilleryUnit?> comparer)
-        {
-            if (_company == null)
-            {
-                return;
-            }
-            _company.Sort(comparer);
-            pictureBoxArtilleryUnit.Image = _company.Show();
        }

        private void FormArtilleryUnitsCollection_Load(object sender, EventArgs e)
        {

        }
+
+        private void panelCompanyTools_Paint(object sender, PaintEventArgs e)
+        {
+
+        }
+
+        private void groupBoxTools_Enter(object sender, EventArgs e)
+        {
+
+        }
+
+        private void textBoxCollectionName_TextChanged(object sender, EventArgs e)
+        {
+
+        }
    }
 }
--- a/ArtilleryUnit/ArtilleryUnit/FormArtilleryUnitsCollection.resx
+++ b/ArtilleryUnit/ArtilleryUnit/FormArtilleryUnitsCollection.resx
--- a/ArtilleryUnit/ArtilleryUnit/FormCruiserConfing.Designer.cs
+++ b/ArtilleryUnit/ArtilleryUnit/FormCruiserConfing.Designer.cs
@@ -1,370 +0,0 @@
-namespace ProjectArtilleryUnit
-{
-    partial class FormArtilleryUnitConfing
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            groupBoxConfing = new GroupBox();
-            groupBoxColors = new GroupBox();
-            panelPurple = new Panel();
-            panelBlack = new Panel();
-            panelGray = new Panel();
-            panelWhite = new Panel();
-            panelYellow = new Panel();
-            panelBlue = new Panel();
-            panelGreen = new Panel();
-            panelRed = new Panel();
-            checkBoxLuke = new CheckBox();
-            checkBoxGun = new CheckBox();
-            checkBoxMuzzle = new CheckBox();
-            numericUpDownWeight = new NumericUpDown();
-            labelWeight = new Label();
-            numericUpDownSpeed = new NumericUpDown();
-            labelSpeed = new Label();
-            labelModifiedObject = new Label();
-            labelSimpleObject = new Label();
-            pictureBoxObject = new PictureBox();
-            buttonAdd = new Button();
-            buttonCancel = new Button();
-            panelObject = new Panel();
-            labelAdditionalColor = new Label();
-            labelBodyColor = new Label();
-            groupBoxConfing.SuspendLayout();
-            groupBoxColors.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit();
-            panelObject.SuspendLayout();
-            SuspendLayout();
-            // 
-            // groupBoxConfing
-            // 
-            groupBoxConfing.Controls.Add(groupBoxColors);
-            groupBoxConfing.Controls.Add(checkBoxLuke);
-            groupBoxConfing.Controls.Add(checkBoxGun);
-            groupBoxConfing.Controls.Add(checkBoxMuzzle);
-            groupBoxConfing.Controls.Add(numericUpDownWeight);
-            groupBoxConfing.Controls.Add(labelWeight);
-            groupBoxConfing.Controls.Add(numericUpDownSpeed);
-            groupBoxConfing.Controls.Add(labelSpeed);
-            groupBoxConfing.Controls.Add(labelModifiedObject);
-            groupBoxConfing.Controls.Add(labelSimpleObject);
-            groupBoxConfing.Dock = DockStyle.Left;
-            groupBoxConfing.Location = new Point(0, 0);
-            groupBoxConfing.Name = "groupBoxConfing";
-            groupBoxConfing.Size = new Size(626, 262);
-            groupBoxConfing.TabIndex = 0;
-            groupBoxConfing.TabStop = false;
-            groupBoxConfing.Text = "Параметры";
-            // 
-            // groupBoxColors
-            // 
-            groupBoxColors.Controls.Add(panelPurple);
-            groupBoxColors.Controls.Add(panelBlack);
-            groupBoxColors.Controls.Add(panelGray);
-            groupBoxColors.Controls.Add(panelWhite);
-            groupBoxColors.Controls.Add(panelYellow);
-            groupBoxColors.Controls.Add(panelBlue);
-            groupBoxColors.Controls.Add(panelGreen);
-            groupBoxColors.Controls.Add(panelRed);
-            groupBoxColors.Location = new Point(327, 26);
-            groupBoxColors.Name = "groupBoxColors";
-            groupBoxColors.Size = new Size(280, 154);
-            groupBoxColors.TabIndex = 9;
-            groupBoxColors.TabStop = false;
-            groupBoxColors.Text = "Цвета";
-            // 
-            // panelPurple
-            // 
-            panelPurple.BackColor = Color.Purple;
-            panelPurple.Location = new Point(217, 96);
-            panelPurple.Name = "panelPurple";
-            panelPurple.Size = new Size(48, 47);
-            panelPurple.TabIndex = 1;
-            // 
-            // panelBlack
-            // 
-            panelBlack.BackColor = Color.Black;
-            panelBlack.Location = new Point(149, 96);
-            panelBlack.Name = "panelBlack";
-            panelBlack.Size = new Size(48, 47);
-            panelBlack.TabIndex = 1;
-            // 
-            // panelGray
-            // 
-            panelGray.BackColor = Color.Gray;
-            panelGray.Location = new Point(82, 96);
-            panelGray.Name = "panelGray";
-            panelGray.Size = new Size(48, 47);
-            panelGray.TabIndex = 1;
-            // 
-            // panelWhite
-            // 
-            panelWhite.BackColor = Color.White;
-            panelWhite.Location = new Point(17, 96);
-            panelWhite.Name = "panelWhite";
-            panelWhite.Size = new Size(48, 47);
-            panelWhite.TabIndex = 1;
-            // 
-            // panelYellow
-            // 
-            panelYellow.BackColor = Color.Yellow;
-            panelYellow.Location = new Point(217, 31);
-            panelYellow.Name = "panelYellow";
-            panelYellow.Size = new Size(48, 47);
-            panelYellow.TabIndex = 1;
-            // 
-            // panelBlue
-            // 
-            panelBlue.BackColor = Color.Blue;
-            panelBlue.Location = new Point(149, 31);
-            panelBlue.Name = "panelBlue";
-            panelBlue.Size = new Size(48, 47);
-            panelBlue.TabIndex = 1;
-            // 
-            // panelGreen
-            // 
-            panelGreen.BackColor = Color.Green;
-            panelGreen.Location = new Point(82, 31);
-            panelGreen.Name = "panelGreen";
-            panelGreen.Size = new Size(48, 47);
-            panelGreen.TabIndex = 1;
-            // 
-            // panelRed
-            // 
-            panelRed.BackColor = Color.Red;
-            panelRed.Location = new Point(17, 31);
-            panelRed.Name = "panelRed";
-            panelRed.Size = new Size(48, 47);
-            panelRed.TabIndex = 0;
-            // 
-            // checkBoxLuke
-            // 
-            checkBoxLuke.AutoSize = true;
-            checkBoxLuke.Location = new Point(6, 217);
-            checkBoxLuke.Name = "checkBoxLuke";
-            checkBoxLuke.Size = new Size(202, 24);
-            checkBoxLuke.TabIndex = 8;
-            checkBoxLuke.Text = "Признак наличие пушки";
-            checkBoxLuke.UseVisualStyleBackColor = true;
-            // 
-            // checkBoxGun
-            // 
-            checkBoxGun.AutoSize = true;
-            checkBoxGun.Location = new Point(6, 169);
-            checkBoxGun.Name = "checkBoxGun";
-            checkBoxGun.Size = new Size(215, 24);
-            checkBoxGun.TabIndex = 7;
-            checkBoxGun.Text = "Признак наличие шлюпок";
-            checkBoxGun.UseVisualStyleBackColor = true;
-            // 
-            // checkBoxMuzzle
-            // 
-            checkBoxMuzzle.AutoSize = true;
-            checkBoxMuzzle.Location = new Point(6, 123);
-            checkBoxMuzzle.Name = "checkBoxMuzzle";
-            checkBoxMuzzle.Size = new Size(321, 24);
-            checkBoxMuzzle.TabIndex = 6;
-            checkBoxMuzzle.Text = "Признак наличие вертолетной площадки";
-            checkBoxMuzzle.UseVisualStyleBackColor = true;
-            // 
-            // numericUpDownWeight
-            // 
-            numericUpDownWeight.Location = new Point(94, 68);
-            numericUpDownWeight.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
-            numericUpDownWeight.Minimum = new decimal(new int[] { 100, 0, 0, 0 });
-            numericUpDownWeight.Name = "numericUpDownWeight";
-            numericUpDownWeight.Size = new Size(114, 27);
-            numericUpDownWeight.TabIndex = 5;
-            numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 });
-            // 
-            // labelWeight
-            // 
-            labelWeight.AutoSize = true;
-            labelWeight.Location = new Point(27, 70);
-            labelWeight.Name = "labelWeight";
-            labelWeight.Size = new Size(36, 20);
-            labelWeight.TabIndex = 4;
-            labelWeight.Text = "Вес:";
-            // 
-            // numericUpDownSpeed
-            // 
-            numericUpDownSpeed.Location = new Point(94, 32);
-            numericUpDownSpeed.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
-            numericUpDownSpeed.Minimum = new decimal(new int[] { 100, 0, 0, 0 });
-            numericUpDownSpeed.Name = "numericUpDownSpeed";
-            numericUpDownSpeed.Size = new Size(114, 27);
-            numericUpDownSpeed.TabIndex = 3;
-            numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 });
-            // 
-            // labelSpeed
-            // 
-            labelSpeed.AutoSize = true;
-            labelSpeed.Location = new Point(12, 32);
-            labelSpeed.Name = "labelSpeed";
-            labelSpeed.Size = new Size(76, 20);
-            labelSpeed.TabIndex = 2;
-            labelSpeed.Text = "Скорость:";
-            // 
-            // labelModifiedObject
-            // 
-            labelModifiedObject.BorderStyle = BorderStyle.FixedSingle;
-            labelModifiedObject.Location = new Point(476, 203);
-            labelModifiedObject.Name = "labelModifiedObject";
-            labelModifiedObject.Size = new Size(131, 44);
-            labelModifiedObject.TabIndex = 1;
-            labelModifiedObject.Text = "Продвинутый";
-            labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter;
-            labelModifiedObject.MouseDown += labelObject_MouseDown;
-            // 
-            // labelSimpleObject
-            // 
-            labelSimpleObject.BorderStyle = BorderStyle.FixedSingle;
-            labelSimpleObject.Location = new Point(327, 203);
-            labelSimpleObject.Name = "labelSimpleObject";
-            labelSimpleObject.Size = new Size(130, 44);
-            labelSimpleObject.TabIndex = 0;
-            labelSimpleObject.Text = "Простой";
-            labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter;
-            labelSimpleObject.MouseDown += labelObject_MouseDown;
-            // 
-            // pictureBoxObject
-            // 
-            pictureBoxObject.Location = new Point(11, 56);
-            pictureBoxObject.Name = "pictureBoxObject";
-            pictureBoxObject.Size = new Size(183, 125);
-            pictureBoxObject.TabIndex = 1;
-            pictureBoxObject.TabStop = false;
-            // 
-            // buttonAdd
-            // 
-            buttonAdd.Location = new Point(632, 212);
-            buttonAdd.Name = "buttonAdd";
-            buttonAdd.Size = new Size(94, 29);
-            buttonAdd.TabIndex = 2;
-            buttonAdd.Text = "Добавить";
-            buttonAdd.UseVisualStyleBackColor = true;
-            buttonAdd.Click += buttonAdd_Click;
-            // 
-            // buttonCancel
-            // 
-            buttonCancel.Location = new Point(740, 212);
-            buttonCancel.Name = "buttonCancel";
-            buttonCancel.Size = new Size(94, 29);
-            buttonCancel.TabIndex = 3;
-            buttonCancel.Text = "Отмена";
-            buttonCancel.UseVisualStyleBackColor = true;
-            // 
-            // panelObject
-            // 
-            panelObject.AllowDrop = true;
-            panelObject.Controls.Add(labelAdditionalColor);
-            panelObject.Controls.Add(labelBodyColor);
-            panelObject.Controls.Add(pictureBoxObject);
-            panelObject.Location = new Point(632, 12);
-            panelObject.Name = "panelObject";
-            panelObject.Size = new Size(205, 194);
-            panelObject.TabIndex = 4;
-            panelObject.DragDrop += PanelObject_DragDrop;
-            panelObject.DragEnter += PanelObject_DragEnter;
-            // 
-            // labelAdditionalColor
-            // 
-            labelAdditionalColor.AllowDrop = true;
-            labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle;
-            labelAdditionalColor.Location = new Point(108, 11);
-            labelAdditionalColor.Name = "labelAdditionalColor";
-            labelAdditionalColor.Size = new Size(83, 36);
-            labelAdditionalColor.TabIndex = 3;
-            labelAdditionalColor.Text = "Доп. цвет";
-            labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter;
-            labelAdditionalColor.DragDrop += labelAdditionalColor_DragDrop;
-            labelAdditionalColor.DragEnter += labelAdditionalColor_DragEnter;
-            // 
-            // labelBodyColor
-            // 
-            labelBodyColor.AllowDrop = true;
-            labelBodyColor.BorderStyle = BorderStyle.FixedSingle;
-            labelBodyColor.Location = new Point(11, 11);
-            labelBodyColor.Name = "labelBodyColor";
-            labelBodyColor.Size = new Size(83, 36);
-            labelBodyColor.TabIndex = 2;
-            labelBodyColor.Text = "Цвет";
-            labelBodyColor.TextAlign = ContentAlignment.MiddleCenter;
-            labelBodyColor.DragDrop += labelBodyColor_DragDrop;
-            labelBodyColor.DragEnter += labelBodyColor_DragEnter;
-            // 
-            // FormArtilleryUnitConfing
-            // 
-            AutoScaleDimensions = new SizeF(8F, 20F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(838, 262);
-            Controls.Add(panelObject);
-            Controls.Add(buttonCancel);
-            Controls.Add(buttonAdd);
-            Controls.Add(groupBoxConfing);
-            Name = "FormArtilleryUnitConfing";
-            Text = "Создание объекта";
-            groupBoxConfing.ResumeLayout(false);
-            groupBoxConfing.PerformLayout();
-            groupBoxColors.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit();
-            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit();
-            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit();
-            panelObject.ResumeLayout(false);
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private GroupBox groupBoxConfing;
-        private Label labelSimpleObject;
-        private Label labelModifiedObject;
-        private Label labelWeight;
-        private NumericUpDown numericUpDownSpeed;
-        private Label labelSpeed;
-        private NumericUpDown numericUpDownWeight;
-        private CheckBox checkBoxMuzzle;
-        private CheckBox checkBoxGun;
-        private CheckBox checkBoxLuke;
-        private GroupBox groupBoxColors;
-        private Panel panelPurple;
-        private Panel panelBlack;
-        private Panel panelGray;
-        private Panel panelWhite;
-        private Panel panelYellow;
-        private Panel panelBlue;
-        private Panel panelGreen;
-        private Panel panelRed;
-        private PictureBox pictureBoxObject;
-        private Button buttonAdd;
-        private Button buttonCancel;
-        private Panel panelObject;
-        private Label labelBodyColor;
-        private Label labelAdditionalColor;
-    }
-}
--- a/ArtilleryUnit/ArtilleryUnit/FormCruiserConfing.cs
+++ b/ArtilleryUnit/ArtilleryUnit/FormCruiserConfing.cs
@@ -1,176 +0,0 @@
-using ProjectArtilleryUnit.Drawnings;
-using ProjectArtilleryUnit.Entities;
-
-namespace ProjectArtilleryUnit
-{
-    /// <summary>
-    /// Форма конфигурации объекта
-    /// </summary>
-    public partial class FormArtilleryUnitConfing : Form
-    {
-        /// <summary>
-        /// Объект - прорисовка артиллерийской установки
-        /// </summary>
-        private DrawningArtilleryUnit _artilleryUnit;
-
-        /// <summary>
-        /// Событие для передачи объекта
-        /// </summary>
-        private event Action<DrawningArtilleryUnit>? ArtilleryUnitDelegate;
-
-        /// <summary>
-        /// Привязка внешнего метода к событию
-        /// </summary>
-        /// <param name="carDelegate"></param>
-        public void AddEvent(Action<DrawningArtilleryUnit> artilleryUnitDelegate)
-        {
-            ArtilleryUnitDelegate += artilleryUnitDelegate;
-        }
-
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        public FormArtilleryUnitConfing()
-        {
-            InitializeComponent();
-
-            panelRed.MouseDown += Panel_MouseDown;
-            panelGreen.MouseDown += Panel_MouseDown;
-            panelBlue.MouseDown += Panel_MouseDown;
-            panelYellow.MouseDown += Panel_MouseDown;
-            panelWhite.MouseDown += Panel_MouseDown;
-            panelGray.MouseDown += Panel_MouseDown;
-            panelBlack.MouseDown += Panel_MouseDown;
-            panelPurple.MouseDown += Panel_MouseDown;
-            //TODO  buttonCancel.Click with lambda с закрытием формы
-            buttonCancel.Click += (sender, e) => Close();
-        }
-
-        /// <summary>
-        /// Прорисовка объекта
-        /// </summary>
-        private void DrawObject()
-        {
-            Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
-            Graphics gr = Graphics.FromImage(bmp);
-            _artilleryUnit?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height);
-            _artilleryUnit?.SetPosition(15, 15);
-            _artilleryUnit?.DrawTransport(gr);
-            pictureBoxObject.Image = bmp;
-        }
-
-        /// <summary>
-        /// Передаем информацию при нажатии на Label
-        /// </summary>
-        /// <param name="sender"></param>labelSimpleObject
-        /// <param name="e"></param>labelSimpleObject
-        private void labelObject_MouseDown(object sender, MouseEventArgs e)
-        {
-            (sender as Label)?.DoDragDrop((sender as Label)?.Name ?? string.Empty, DragDropEffects.Move | DragDropEffects.Copy);
-        }
-
-        /// <summary>
-        /// Проверка получаемой информации (ее типа на соответствие требуемому)
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void PanelObject_DragEnter(object sender, DragEventArgs e)
-        {
-            e.Effect = e.Data?.GetDataPresent(DataFormats.Text) ?? false ? DragDropEffects.Copy : DragDropEffects.None;
-
-        }
-
-        /// <summary>
-        /// Действия при приеме перетаскиваемой информации
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void PanelObject_DragDrop(object sender, DragEventArgs e)
-        {
-            switch (e.Data?.GetData(DataFormats.Text)?.ToString())
-            {
-                case "labelSimpleObject":
-                    _artilleryUnit = new DrawningArtilleryUnit((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White);
-                    break;
-                case "labelModifiedObject":
-                    _artilleryUnit = new
-                    DrawningMilitaryArtilleryUnit((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White,
-                        Color.Black, checkBoxMuzzle.Checked, checkBoxGun.Checked, checkBoxLuke.Checked);
-                    break;
-            }
-            DrawObject();
-        }
-
-        /// <summary>
-        /// Передаем информацию при нажатии на Panel
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void Panel_MouseDown(object sender, MouseEventArgs e)
-        {
-            //TODO отправка цвета в Drag&Drop
-            (sender as Control)?.DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy);
-        }
-
-        // TODO Реализовать логику смены цветов: основного и дополнительного (для продвинутого объекта)
-
-        private void labelBodyColor_DragEnter(object sender, DragEventArgs e)
-        {
-            if (e.Data.GetDataPresent(typeof(Color)))
-            {
-                e.Effect = DragDropEffects.Copy;
-            }
-            else
-            {
-                e.Effect = DragDropEffects.None;
-            }
-        }
-
-        private void labelBodyColor_DragDrop(object sender, DragEventArgs e)
-        {
-            if (_artilleryUnit != null)
-            {
-                _artilleryUnit.EntityArtilleryUnit.setBodyColor((Color)e.Data.GetData(typeof(Color)));
-                DrawObject();
-            }
-        }
-
-        private void labelAdditionalColor_DragEnter(object sender, DragEventArgs e)
-        {
-            if (_artilleryUnit is DrawningArtilleryUnit)
-            {
-                if (e.Data.GetDataPresent(typeof(Color)))
-                {
-                    e.Effect = DragDropEffects.Copy;
-                }
-                else
-                {
-                    e.Effect = DragDropEffects.None;
-                }
-            }
-        }
-
-        private void labelAdditionalColor_DragDrop(object sender, DragEventArgs e)
-        {
-            if (_artilleryUnit.EntityArtilleryUnit is EntityMilitaryArtilleryUnit militaryArtilleryUnit)
-            {
-                militaryArtilleryUnit.setAdditionalColor((Color)e.Data.GetData(typeof(Color)));
-            }
-            DrawObject();
-        }
-
-        /// <summary>
-        /// Передача объекта
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void buttonAdd_Click(object sender, EventArgs e)
-        {
-            if (_artilleryUnit != null)
-            {
-                ArtilleryUnitDelegate?.Invoke(_artilleryUnit);
-                Close();
-            }
-        }
-    }
-}
--- a/ArtilleryUnit/ArtilleryUnit/FormCruisersCollection.resx
+++ b/ArtilleryUnit/ArtilleryUnit/FormCruisersCollection.resx
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema 
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 1</value>
-  </metadata>
-  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>145, 1</value>
-  </metadata>
-  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>310, 1</value>
-  </metadata>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>25</value>
-  </metadata>
-</root>
--- a/ArtilleryUnit/ArtilleryUnit/MovementStrategy/MoveableArtilleryUnit.cs
+++ b/ArtilleryUnit/ArtilleryUnit/MovementStrategy/MoveableArtilleryUnit.cs
--- a/ArtilleryUnit/ArtilleryUnit/Program.cs
+++ b/ArtilleryUnit/ArtilleryUnit/Program.cs
@@ -1,8 +1,3 @@
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Serilog;
-
 namespace ProjectArtilleryUnit
 {
    internal static class Program
@@ -15,31 +10,7 @@ namespace ProjectArtilleryUnit
        {
            // To customize application configuration such as set high DPI settings or default font, see https://aka.ms/applicationconfiguration.
            ApplicationConfiguration.Initialize();
-            ServiceCollection services = new();
-            ConfigureServices(services);
-            using ServiceProvider serviceProvider = services.BuildServiceProvider();
-            Application.Run(serviceProvider.GetRequiredService<FormArtilleryUnitsCollection>());
+            Application.Run(new FormArtilleryUnitsCollection());
        }
-
-        private static void ConfigureServices(ServiceCollection services)
-        {
-            services.AddSingleton<FormArtilleryUnitsCollection>().AddLogging(option =>
-            {
-                string[] path = Directory.GetCurrentDirectory().Split('\\');
-                string pathNeed = "";
-                for (int i = 0; i < path.Length - 3; i++)
-                {
-                    pathNeed += path[i] + "\\";
-                }
-
-                var configuration = new ConfigurationBuilder().SetBasePath(Directory.GetCurrentDirectory())
-                    .AddJsonFile(path: $"{pathNeed}serilogConfig.json", optional: false, reloadOnChange: true)
-                    .Build();
-                var logger = new LoggerConfiguration().ReadFrom.Configuration(configuration).CreateLogger();
-                option.SetMinimumLevel(LogLevel.Information);
-                option.AddSerilog(logger);
-            });
-        }
-
    }
 }
--- a/ArtilleryUnit/ArtilleryUnit/nlog.config
+++ b/ArtilleryUnit/ArtilleryUnit/nlog.config
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-	<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
-	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 autoReload="true" internalLogLevel="Info">
-		<targets>
-			<target xsi:type="File" name="tofile" fileName="artilleryUnitlog-
-${shortdate}.log" />
-		</targets>
-		<rules>
-			<logger name="*" minlevel="Debug" writeTo="tofile" />
-		</rules>
-	</nlog>
-</configuration>
--- a/ArtilleryUnit/ArtilleryUnit/serilogConfig.json
+++ b/ArtilleryUnit/ArtilleryUnit/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": "artilleryUnit"
-    }
-  }
-}
Author	SHA1	Message	Date
Дима	b93ed3e939	в	2024-05-22 21:54:27 +04:00
Дима	58af716a79	в	2024-05-22 21:51:19 +04:00
Дима	481d4571ed	ы	2024-05-22 03:38:35 +04:00
Дима	53ab3a7e32	d	2024-05-22 03:00:46 +04:00