сru

ы
2024-08-30 02:13:57 +04:00 · 2024-08-30 02:08:30 +04:00
23 changed files with 138 additions and 771 deletions
--- a/ProjectBus/ProjectBus/CollectionGenericObjects/AbstractCompany.cs
+++ b/ProjectBus/ProjectBus/CollectionGenericObjects/AbstractCompany.cs
@@ -1,5 +1,4 @@
 using ProjectBoat.Drawnings;
-using ProjectBoat.Exceptions;

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

        /// <summary>
-        /// Коллекция лодок
+        /// Коллекция автомобилей
        /// </summary>
        protected ICollectionGenericObjects<DrawningBoat>? _collection = null;

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

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

        /// <summary>
@@ -97,15 +96,8 @@ namespace ProjectBoat.CollectionGenericObjects
            SetObjectsPosition();
            for (int i = 0; i < (_collection?.Count ?? 0); ++i)
            {
-                try
-                {
-                    DrawningBoat? obj = _collection?.Get(i);
-                    obj?.DrawTransport(graphics);
-                }
-                catch (ObjectNotFoundException e)
-                { }
-                catch (PositionOutOfCollectionException e)
-                { }
+                DrawningBoat? obj = _collection?.Get(i);
+                obj?.DrawTransport(graphics);
            }
            return bitmap;
        }
--- a/ProjectBus/ProjectBus/CollectionGenericObjects/BoatDockingService.cs
+++ b/ProjectBus/ProjectBus/CollectionGenericObjects/BoatDockingService.cs
@@ -1,5 +1,4 @@
 using ProjectBoat.Drawnings;
-using ProjectBoat.Exceptions;

 namespace ProjectBoat.CollectionGenericObjects
 {
@@ -23,7 +22,7 @@ namespace ProjectBoat.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,14 +41,11 @@ namespace ProjectBoat.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)
                    curWidth++;
--- a/ProjectBus/ProjectBus/CollectionGenericObjects/ICollectionGenericObjects.cs
+++ b/ProjectBus/ProjectBus/CollectionGenericObjects/ICollectionGenericObjects.cs
@@ -11,19 +11,16 @@
        /// Количество объектов в коллекции
        /// </summary>
        int Count { get; }
-
        /// <summary>
        /// Установка максимального количества элементов
        /// </summary>
-        int MaxCount { get; set; }
-
+        int SetMaxCount { set; }
        /// <summary>
        /// Добавление объекта в коллекцию
        /// </summary>
        /// <param name="obj">Добавляемый объект</param>
        /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
        int Insert(T obj);
-
        /// <summary>
        /// Добавление объекта в коллекцию на конкретную позицию
        /// </summary>
@@ -31,31 +28,18 @@
        /// <param name="position">Позиция</param>
        /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
        int Insert(T obj, int position);
-
        /// <summary>
        /// Удаление объекта из коллекции с конкретной позиции
        /// </summary>
        /// <param name="position">Позиция</param>
        /// <returns>true - удаление прошло удачно, false - удаление не удалось</returns>
        T? Remove(int position);
-
        /// <summary>
        /// Получение объекта по позиции
        /// </summary>
        /// <param name="position">Позиция</param>
        /// <returns>Объект</returns>
        T? Get(int position);
-
-        /// <summary>
-        /// Получение типа коллекции
-        /// </summary>
-        CollectionType GetCollectionType { get; }
-        /// <summary>
-        /// Получение объектов коллекции по одному
-        /// </summary>
-        /// <returns>Поэлементый вывод элементов коллекции</returns>
-        IEnumerable<T?> GetItems();
-
    }

 }
--- a/ProjectBus/ProjectBus/CollectionGenericObjects/ListGenericObjects.cs
+++ b/ProjectBus/ProjectBus/CollectionGenericObjects/ListGenericObjects.cs
@@ -1,6 +1,4 @@
-using ProjectBoat.Exceptions;
-
-namespace ProjectBoat.CollectionGenericObjects
+namespace ProjectBoat.CollectionGenericObjects
 {
    /// <summary>
    /// Параметризованный набор объектов
@@ -18,20 +16,7 @@ namespace ProjectBoat.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>
@@ -42,18 +27,15 @@ namespace ProjectBoat.CollectionGenericObjects
        public T? Get(int position)
        {
            // TODO проверка позиции
-            // 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)
        {
            // TODO проверка, что не превышено максимальное количество элементов
-            // TODO выбром позиций, если переполнение
            // TODO вставка в конец набора
-            if (Count == _maxCount) throw new CollectionOverflowException(Count);
+            if (Count == _maxCount) return -1;
            _collection.Add(obj);
            return Count;
        }
@@ -63,8 +45,8 @@ namespace ProjectBoat.CollectionGenericObjects
            // TODO проверка, что не превышено максимальное количество элементов
            // TODO проверка позиции
            // TODO вставка по позиции
-            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;

@@ -74,19 +56,10 @@ namespace ProjectBoat.CollectionGenericObjects
        {
            // 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];
-            }
-        }
    }
 }
--- a/ProjectBus/ProjectBus/CollectionGenericObjects/MassiveGenericObjects.cs
+++ b/ProjectBus/ProjectBus/CollectionGenericObjects/MassiveGenericObjects.cs
@@ -1,4 +1,4 @@
-using ProjectBoat.Exceptions;
+using ProjectBoat.Drawnings;

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

-        public CollectionType GetCollectionType => CollectionType.Massive;
-
        /// <summary>
        /// Конструктор
        /// </summary>
@@ -48,30 +42,26 @@ namespace ProjectBoat.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)
        {
            // TODO вставка в свободное место набора
-            // TODO выброc позиций, если переполнение
            int index = 0;
-            while (index < Count && _collection[index] != null)
+            while (index < _collection.Length)
            {
+                if (_collection[index] == null)
+                {
+                    _collection[index] = obj;
+                    return index;
+                }
+
                index++;
            }
-
-            if (index < Count)
-            {
-                _collection[index] = obj;
-                return index;
-            }
-
-            throw new CollectionOverflowException(Count);
+            return -1;
        }

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

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

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

-            _collection[position] = obj;
-            return position;
+            for (index = position - 1; index >= 0; --index)
+            {
+                if (_collection[index] == null)
+                {
+                    _collection[position] = obj;
+                    return position;
+                }
+            }
+            return -1;
        }

        public T Remove(int position)
        {
            // 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];
-            }
+            return obj;
        }
    }
 }
--- a/ProjectBus/ProjectBus/CollectionGenericObjects/StorageCollection.cs
+++ b/ProjectBus/ProjectBus/CollectionGenericObjects/StorageCollection.cs
@@ -1,14 +1,10 @@
-using ProjectBoat.Drawnings;
-using ProjectBoat.Exceptions;
-using System.Text;
-
-namespace ProjectBoat.CollectionGenericObjects
+namespace ProjectBoat.CollectionGenericObjects
 {
    // Класс-хранилище коллекций
    /// </summary>
    /// <typeparam name="T"></typeparam>
    public class StorageCollection<T>
-        where T : DrawningBoat
+        where T : class
    {
        /// <summary>
        /// Словарь (хранилище) с коллекциями
@@ -20,21 +16,6 @@ namespace ProjectBoat.CollectionGenericObjects
        /// </summary>
        public List<string> Keys => _storages.Keys.ToList();

-        /// <summary>
-        /// Ключевое слово, с которого должен начинаться файл
-        /// </summary>
-        private readonly string _collectionKey = "CollectionsStorage";
-
-        /// <summary>
-        /// Разделитель для записи ключа и значения элемента словаря
-        /// </summary>
-        private readonly string _separatorForKeyValue = "|";
-
-        /// <summary>
-        /// Разделитель для записей коллекции данных в файл
-        /// </summary>
-        private readonly string _separatorItems = ";";
-
        /// <summary>
        /// Конструктор
        /// </summary>
@@ -88,131 +69,5 @@ namespace ProjectBoat.CollectionGenericObjects
                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<string, 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.GetCollectionType);
-                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 != 4)
-                    {
-                        continue;
-                    }
-                    CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]);
-                    ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionType);
-                    if (collection == null)
-                    {
-                        throw new InvalidOperationException("Не удалось определить тип коллекции:" + record[1]);
-                    }
-
-                    collection.MaxCount = Convert.ToInt32(record[2]);
-
-                    string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
-                    foreach (string elem in set)
-                    {
-                        if (elem?.CreateDrawningBoat() is T aircraft)
-                        {
-                            try
-                            {
-                                if (collection.Insert(aircraft) == -1)
-                                {
-                                    throw new InvalidOperationException("Объект не удалось добавить в коллекцию: " + record[3]);
-                                }
-                            }
-                            catch (CollectionOverflowException ex)
-                            {
-                                throw new CollectionOverflowException("Коллекция переполнена", ex);
-                            }
-                        }
-                    }
-                    _storages.Add(record[0], collection);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Создание коллекции по типу
-        /// </summary>
-        /// <param name="collectionType"></param>
-        /// <returns></returns>
-        private static ICollectionGenericObjects<T>? CreateCollection(CollectionType collectionType)
-        {
-            return collectionType switch
-            {
-                CollectionType.Massive => new MassiveGenericObjects<T>(),
-                CollectionType.List => new ListGenericObjects<T>(),
-                _ => null,
-            };
-        }
    }
 }
--- a/ProjectBus/ProjectBus/Drawnings/DrawningBoat.cs
+++ b/ProjectBus/ProjectBus/Drawnings/DrawningBoat.cs
@@ -1,4 +1,5 @@
 using ProjectBoat.Entities;
+using System.Drawing.Drawing2D;

 namespace ProjectBoat.Drawnings;
 /// <summary>
@@ -29,9 +30,10 @@ public class DrawningBoat

    /// <summary>
    /// Ширина прорисовки лодки
+    /// </summary>
    private readonly int _drawningBoatWidth = 150;
    /// <summary>
-    /// Высота прорисовки лодки 
+    /// Высота прорисовки лодки
    /// </summary>
    private readonly int _drawningBoatHeight = 50;
    private readonly int _drawningEnginesWidth = 3;
@@ -56,7 +58,7 @@ public class DrawningBoat
    /// <summary>
    /// Пустой онструктор
    /// </summary>
-    public DrawningBoat()
+    private DrawningBoat()
    {
        _pictureWidth = null;
        _pictureHeight = null;
@@ -85,14 +87,6 @@ public class DrawningBoat
        _pictureHeight = drawningCarHeight;
    }

-    /// <summary>
-    /// конструктор
-    /// </summary>
-    /// <param name="entityBoat"></param>
-    public DrawningBoat(EntityBoat entityBoat)
-    {
-        EntityBoat = entityBoat;
-    }
    /// <summary>
    /// Установка границ поля
    /// </summary>
--- a/ProjectBus/ProjectBus/Drawnings/DrawningMBoat.cs
+++ b/ProjectBus/ProjectBus/Drawnings/DrawningMBoat.cs
@@ -5,6 +5,7 @@ namespace ProjectBoat.Drawnings
 {
    public class DrawningMBoat : DrawningBoat
    {
+
        /// <summary>
        /// Конструктор
        /// </summary>
@@ -22,13 +23,6 @@ namespace ProjectBoat.Drawnings
            EntityBoat = new EntityMBoat(speed, weight, bodyColor, additionalColor, motor, oars, glass);
        }

-        public DrawningMBoat(EntityBoat entityBoat)
-        {
-            if (entityBoat != null)
-            {
-                EntityBoat = entityBoat;
-            }
-        }
        public override void DrawTransport(Graphics g)
        {
            if (EntityBoat == null || EntityBoat is not EntityMBoat entityMBoat || !_startPosX.HasValue ||
--- a/ProjectBus/ProjectBus/Drawnings/ExtentionDrawningBoat.cs
+++ b/ProjectBus/ProjectBus/Drawnings/ExtentionDrawningBoat.cs
@@ -1,50 +0,0 @@
-using ProjectBoat.Entities;
-
-namespace ProjectBoat.Drawnings
-{
-    public static class ExtentionDrawningBoat
-    {
-        /// <summary>
-        /// Разделитель для записи информации по объекту в файл
-        /// </summary>
-        private static readonly string _separatorForObject = ":";
-
-        /// <summary>
-        /// Создание объекта из строки
-        /// </summary>
-        /// <param name="info">Строка с данными для создания объекта</param>
-        /// <returns>Объект</returns>
-        public static DrawningBoat? CreateDrawningBoat(this string info)
-        {
-            string[] strs = info.Split(_separatorForObject);
-            EntityBoat? boat = EntityMBoat.CreateEntityMBoat(strs);
-            if (boat != null)
-            {
-                return new DrawningMBoat(boat);
-            }
-
-            boat = EntityBoat.CreateEntityBoat(strs);
-            if (boat != null)
-            {
-                return new DrawningBoat(boat);
-            }
-            return null;
-        }
-
-        /// <summary>
-        /// Получение данных для сохранения в файл
-        /// </summary>
-        /// <param name="drawningBoat">Сохраняемый объект</param>
-        /// <returns>Строка с данными по объекту</returns>
-        public static string GetDataForSave(this DrawningBoat drawningBoat)
-        {
-            string[]? array = drawningBoat?.EntityBoat?.GetStringRepresentation();
-            if (array == null)
-            {
-                return string.Empty;
-            }
-            return string.Join(_separatorForObject, array);
-        }
-
-    }
-}
--- a/ProjectBus/ProjectBus/Entities/EntityBoat.cs
+++ b/ProjectBus/ProjectBus/Entities/EntityBoat.cs
@@ -38,27 +38,4 @@ public class EntityBoat
        Weight = weight;
        BodyColor = bodyColor;
    }
-    /// <summary>
-    /// Получение строк со значениями свойств объекта класса-сущности
-    /// </summary>
-    /// <returns></returns>
-    public virtual string[] GetStringRepresentation()
-    {
-        return new[] { nameof(EntityBoat), Speed.ToString(), Weight.ToString(), BodyColor.Name };
-    }
-
-    /// <summary>
-    /// Создание объекта из массива строк
-    /// </summary>
-    /// <param name="strs"></param>
-    /// <returns></returns>
-    public static EntityBoat? CreateEntityBoat(string[] strs)
-    {
-        if (strs.Length != 4 || strs[0] != nameof(EntityBoat))
-        {
-            return null;
-        }
-
-        return new EntityBoat(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]));
-    }
-}
+}
--- a/ProjectBus/ProjectBus/Entities/EntityMBoat.cs
+++ b/ProjectBus/ProjectBus/Entities/EntityMBoat.cs
@@ -29,30 +29,5 @@
            Oars = oars;
            Glass = glass;
        }
-        /// <summary>
-        /// Получение строк со значениями свойств объекта класса-сущности
-        /// </summary>
-        /// <returns></returns>
-        public override string[] GetStringRepresentation()
-        {
-            return new[] { nameof(EntityBoat), Speed.ToString(), Weight.ToString(), BodyColor.Name, AdditionalColor.Name,
-            Motor.ToString(), Oars.ToString(), Glass.ToString() };
-        }
-
-        /// <summary>
-        /// Создание объекта из массива строк
-        /// </summary>
-        /// <param name="strs"></param>
-        /// <returns></returns>
-        public static EntityBoat? CreateEntityMBoat(string[] strs)
-        {
-            if (strs.Length != 8 || strs[0] != nameof(EntityBoat))
-            {
-                return null;
-            }
-            return new EntityMBoat(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/ProjectBus/ProjectBus/Exceptions/CollectionOverflowException.cs
+++ b/ProjectBus/ProjectBus/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 ProjectBoat.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/ProjectBus/ProjectBus/Exceptions/ObjectNotFoundException.cs
+++ b/ProjectBus/ProjectBus/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 ProjectBoat.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/ProjectBus/ProjectBus/Exceptions/PositionOutOfCollectionException.cs
+++ b/ProjectBus/ProjectBus/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 ProjectBoat.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/ProjectBus/ProjectBus/FormBoatConfing.cs
+++ b/ProjectBus/ProjectBus/FormBoatConfing.cs
@@ -9,7 +9,7 @@ namespace ProjectBoat
    public partial class FormBoatConfing : Form
    {
        /// <summary>
-        /// Объект - прорисовка лодки
+        /// Объект - прорисовка лодка
        /// </summary>
        private DrawningBoat _boat;

--- a/ProjectBus/ProjectBus/FormBoatsCollection.Designer.cs
+++ b/ProjectBus/ProjectBus/FormBoatsCollection.Designer.cs
@@ -46,17 +46,10 @@
            maskedTextBoxPosision = new MaskedTextBox();
            buttonGetToTest = new Button();
            pictureBoxBoat = 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)pictureBoxBoat).BeginInit();
-            menuStrip.SuspendLayout();
            SuspendLayout();
            // 
            // groupBoxTools
@@ -66,18 +59,21 @@
            groupBoxTools.Controls.Add(comboBoxSelectorCompany);
            groupBoxTools.Controls.Add(panelCompanyTools);
            groupBoxTools.Dock = DockStyle.Right;
-            groupBoxTools.Location = new Point(631, 28);
+            groupBoxTools.Location = new Point(510, 0);
+            groupBoxTools.Margin = new Padding(3, 2, 3, 2);
            groupBoxTools.Name = "groupBoxTools";
-            groupBoxTools.Size = new Size(222, 651);
+            groupBoxTools.Padding = new Padding(3, 2, 3, 2);
+            groupBoxTools.Size = new Size(194, 490);
            groupBoxTools.TabIndex = 0;
            groupBoxTools.TabStop = false;
            groupBoxTools.Text = "инструменты";
            // 
            // buttonCreateCompany
            // 
-            buttonCreateCompany.Location = new Point(21, 345);
+            buttonCreateCompany.Location = new Point(18, 259);
+            buttonCreateCompany.Margin = new Padding(3, 2, 3, 2);
            buttonCreateCompany.Name = "buttonCreateCompany";
-            buttonCreateCompany.Size = new Size(186, 27);
+            buttonCreateCompany.Size = new Size(163, 20);
            buttonCreateCompany.TabIndex = 7;
            buttonCreateCompany.Text = "Создать компанию";
            buttonCreateCompany.UseVisualStyleBackColor = true;
@@ -93,16 +89,18 @@
            panelStorage.Controls.Add(textBoxCollectionName);
            panelStorage.Controls.Add(labelCollectionName);
            panelStorage.Dock = DockStyle.Top;
-            panelStorage.Location = new Point(3, 23);
+            panelStorage.Location = new Point(3, 18);
+            panelStorage.Margin = new Padding(3, 2, 3, 2);
            panelStorage.Name = "panelStorage";
-            panelStorage.Size = new Size(216, 283);
+            panelStorage.Size = new Size(188, 212);
            panelStorage.TabIndex = 6;
            // 
            // buttonCollectionDel
            // 
-            buttonCollectionDel.Location = new Point(17, 247);
+            buttonCollectionDel.Location = new Point(15, 185);
+            buttonCollectionDel.Margin = new Padding(3, 2, 3, 2);
            buttonCollectionDel.Name = "buttonCollectionDel";
-            buttonCollectionDel.Size = new Size(186, 27);
+            buttonCollectionDel.Size = new Size(163, 20);
            buttonCollectionDel.TabIndex = 6;
            buttonCollectionDel.Text = "Удалить коллекцию";
            buttonCollectionDel.UseVisualStyleBackColor = true;
@@ -111,17 +109,19 @@
            // listBoxCollection
            // 
            listBoxCollection.FormattingEnabled = true;
-            listBoxCollection.ItemHeight = 20;
-            listBoxCollection.Location = new Point(17, 137);
+            listBoxCollection.ItemHeight = 15;
+            listBoxCollection.Location = new Point(15, 103);
+            listBoxCollection.Margin = new Padding(3, 2, 3, 2);
            listBoxCollection.Name = "listBoxCollection";
-            listBoxCollection.Size = new Size(186, 104);
+            listBoxCollection.Size = new Size(163, 79);
            listBoxCollection.TabIndex = 5;
            // 
            // buttonCollecctionAdd
            // 
-            buttonCollecctionAdd.Location = new Point(17, 104);
+            buttonCollecctionAdd.Location = new Point(15, 78);
+            buttonCollecctionAdd.Margin = new Padding(3, 2, 3, 2);
            buttonCollecctionAdd.Name = "buttonCollecctionAdd";
-            buttonCollecctionAdd.Size = new Size(186, 27);
+            buttonCollecctionAdd.Size = new Size(163, 20);
            buttonCollecctionAdd.TabIndex = 4;
            buttonCollecctionAdd.Text = "Добавить коллекцию";
            buttonCollecctionAdd.UseVisualStyleBackColor = true;
@@ -130,9 +130,10 @@
            // radioButtonList
            // 
            radioButtonList.AutoSize = true;
-            radioButtonList.Location = new Point(123, 75);
+            radioButtonList.Location = new Point(108, 56);
+            radioButtonList.Margin = new Padding(3, 2, 3, 2);
            radioButtonList.Name = "radioButtonList";
-            radioButtonList.Size = new Size(80, 24);
+            radioButtonList.Size = new Size(66, 19);
            radioButtonList.TabIndex = 3;
            radioButtonList.TabStop = true;
            radioButtonList.Text = "Список";
@@ -141,9 +142,10 @@
            // radioButtonMassive
            // 
            radioButtonMassive.AutoSize = true;
-            radioButtonMassive.Location = new Point(17, 75);
+            radioButtonMassive.Location = new Point(15, 56);
+            radioButtonMassive.Margin = new Padding(3, 2, 3, 2);
            radioButtonMassive.Name = "radioButtonMassive";
-            radioButtonMassive.Size = new Size(82, 24);
+            radioButtonMassive.Size = new Size(67, 19);
            radioButtonMassive.TabIndex = 2;
            radioButtonMassive.TabStop = true;
            radioButtonMassive.Text = "Массив";
@@ -151,17 +153,18 @@
            // 
            // textBoxCollectionName
            // 
-            textBoxCollectionName.Location = new Point(17, 32);
+            textBoxCollectionName.Location = new Point(15, 24);
+            textBoxCollectionName.Margin = new Padding(3, 2, 3, 2);
            textBoxCollectionName.Name = "textBoxCollectionName";
-            textBoxCollectionName.Size = new Size(186, 27);
+            textBoxCollectionName.Size = new Size(163, 23);
            textBoxCollectionName.TabIndex = 1;
            // 
            // labelCollectionName
            // 
            labelCollectionName.AutoSize = true;
-            labelCollectionName.Location = new Point(26, 9);
+            labelCollectionName.Location = new Point(23, 7);
            labelCollectionName.Name = "labelCollectionName";
-            labelCollectionName.Size = new Size(155, 20);
+            labelCollectionName.Size = new Size(122, 15);
            labelCollectionName.TabIndex = 0;
            labelCollectionName.Text = "Название коллекции";
            // 
@@ -170,9 +173,10 @@
            comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
            comboBoxSelectorCompany.FormattingEnabled = true;
            comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
-            comboBoxSelectorCompany.Location = new Point(21, 311);
+            comboBoxSelectorCompany.Location = new Point(18, 233);
+            comboBoxSelectorCompany.Margin = new Padding(3, 2, 3, 2);
            comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
-            comboBoxSelectorCompany.Size = new Size(186, 28);
+            comboBoxSelectorCompany.Size = new Size(163, 23);
            comboBoxSelectorCompany.TabIndex = 0;
            comboBoxSelectorCompany.SelectedIndexChanged += comboBoxSelectorCompany_SelectedIndexChanged_1;
            // 
@@ -184,18 +188,20 @@
            panelCompanyTools.Controls.Add(maskedTextBoxPosision);
            panelCompanyTools.Controls.Add(buttonGetToTest);
            panelCompanyTools.Enabled = false;
-            panelCompanyTools.Location = new Point(3, 379);
+            panelCompanyTools.Location = new Point(3, 284);
+            panelCompanyTools.Margin = new Padding(3, 2, 3, 2);
            panelCompanyTools.Name = "panelCompanyTools";
-            panelCompanyTools.Size = new Size(216, 274);
+            panelCompanyTools.Size = new Size(189, 206);
            panelCompanyTools.TabIndex = 8;
            // 
            // ButtonAddBoat
            // 
            ButtonAddBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
            ButtonAddBoat.BackgroundImageLayout = ImageLayout.Center;
-            ButtonAddBoat.Location = new Point(18, 3);
+            ButtonAddBoat.Location = new Point(16, 2);
+            ButtonAddBoat.Margin = new Padding(3, 2, 3, 2);
            ButtonAddBoat.Name = "ButtonAddBoat";
-            ButtonAddBoat.Size = new Size(186, 40);
+            ButtonAddBoat.Size = new Size(163, 30);
            ButtonAddBoat.TabIndex = 1;
            ButtonAddBoat.Text = "добваление лодки";
            ButtonAddBoat.UseVisualStyleBackColor = true;
@@ -204,9 +210,10 @@
            // buttonRefresh
            // 
            buttonRefresh.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonRefresh.Location = new Point(18, 227);
+            buttonRefresh.Location = new Point(16, 170);
+            buttonRefresh.Margin = new Padding(3, 2, 3, 2);
            buttonRefresh.Name = "buttonRefresh";
-            buttonRefresh.Size = new Size(186, 41);
+            buttonRefresh.Size = new Size(163, 31);
            buttonRefresh.TabIndex = 5;
            buttonRefresh.Text = "обновить";
            buttonRefresh.UseVisualStyleBackColor = true;
@@ -215,9 +222,10 @@
            // ButtonRemoveBoat
            // 
            ButtonRemoveBoat.Anchor = AnchorStyles.Right;
-            ButtonRemoveBoat.Location = new Point(18, 138);
+            ButtonRemoveBoat.Location = new Point(16, 104);
+            ButtonRemoveBoat.Margin = new Padding(3, 2, 3, 2);
            ButtonRemoveBoat.Name = "ButtonRemoveBoat";
-            ButtonRemoveBoat.Size = new Size(186, 40);
+            ButtonRemoveBoat.Size = new Size(163, 30);
            ButtonRemoveBoat.TabIndex = 3;
            ButtonRemoveBoat.Text = "удалить лодку";
            ButtonRemoveBoat.UseVisualStyleBackColor = true;
@@ -225,19 +233,21 @@
            // 
            // maskedTextBoxPosision
            // 
-            maskedTextBoxPosision.Location = new Point(17, 105);
+            maskedTextBoxPosision.Location = new Point(15, 79);
+            maskedTextBoxPosision.Margin = new Padding(3, 2, 3, 2);
            maskedTextBoxPosision.Mask = "00";
            maskedTextBoxPosision.Name = "maskedTextBoxPosision";
-            maskedTextBoxPosision.Size = new Size(187, 27);
+            maskedTextBoxPosision.Size = new Size(164, 23);
            maskedTextBoxPosision.TabIndex = 2;
            maskedTextBoxPosision.ValidatingType = typeof(int);
            // 
            // buttonGetToTest
            // 
            buttonGetToTest.Anchor = AnchorStyles.Right;
-            buttonGetToTest.Location = new Point(18, 184);
+            buttonGetToTest.Location = new Point(16, 138);
+            buttonGetToTest.Margin = new Padding(3, 2, 3, 2);
            buttonGetToTest.Name = "buttonGetToTest";
-            buttonGetToTest.Size = new Size(186, 40);
+            buttonGetToTest.Size = new Size(163, 30);
            buttonGetToTest.TabIndex = 4;
            buttonGetToTest.Text = "передать на тесты";
            buttonGetToTest.UseVisualStyleBackColor = true;
@@ -246,62 +256,21 @@
            // pictureBoxBoat
            // 
            pictureBoxBoat.Dock = DockStyle.Fill;
-            pictureBoxBoat.Location = new Point(0, 28);
+            pictureBoxBoat.Location = new Point(0, 0);
+            pictureBoxBoat.Margin = new Padding(3, 2, 3, 2);
            pictureBoxBoat.Name = "pictureBoxBoat";
-            pictureBoxBoat.Size = new Size(631, 651);
+            pictureBoxBoat.Size = new Size(510, 490);
            pictureBoxBoat.TabIndex = 1;
            pictureBoxBoat.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.Size = new Size(853, 28);
-            menuStrip.TabIndex = 2;
-            menuStrip.Text = "menuStrip1";
-            // 
-            // файлToolStripMenuItem
-            // 
-            файлToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { saveToolStripMenuItem, loadToolStripMenuItem });
-            файлToolStripMenuItem.Name = "файлToolStripMenuItem";
-            файлToolStripMenuItem.Size = new Size(59, 24);
-            файлToolStripMenuItem.Text = "Файл";
-            // 
-            // saveToolStripMenuItem
-            // 
-            saveToolStripMenuItem.Name = "saveToolStripMenuItem";
-            saveToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.S;
-            saveToolStripMenuItem.Size = new Size(227, 26);
-            saveToolStripMenuItem.Text = "Сохранение";
-            saveToolStripMenuItem.Click += SaveToolStripMenuItem_Click;
-            // 
-            // loadToolStripMenuItem
-            // 
-            loadToolStripMenuItem.Name = "loadToolStripMenuItem";
-            loadToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.L;
-            loadToolStripMenuItem.Size = new Size(227, 26);
-            loadToolStripMenuItem.Text = "Загрузка";
-            loadToolStripMenuItem.Click += LoadToolStripMenuItem_Click;
-            // 
-            // saveFileDialog
-            // 
-            saveFileDialog.Filter = "txt file|*.txt";
-            // 
-            // openFileDialog
-            // 
-            openFileDialog.Filter = "txt file|*.txt";
-            // 
            // FormBoatsCollection
            // 
-            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleDimensions = new SizeF(7F, 15F);
            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(853, 679);
+            ClientSize = new Size(704, 490);
            Controls.Add(pictureBoxBoat);
            Controls.Add(groupBoxTools);
-            Controls.Add(menuStrip);
-            MainMenuStrip = menuStrip;
+            Margin = new Padding(3, 2, 3, 2);
            Name = "FormBoatsCollection";
            Text = "FormBoatsCollection";
            groupBoxTools.ResumeLayout(false);
@@ -310,10 +279,7 @@
            panelCompanyTools.ResumeLayout(false);
            panelCompanyTools.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)pictureBoxBoat).EndInit();
-            menuStrip.ResumeLayout(false);
-            menuStrip.PerformLayout();
            ResumeLayout(false);
-            PerformLayout();
        }

        #endregion
@@ -336,11 +302,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;
    }
 }
--- a/ProjectBus/ProjectBus/FormBoatsCollection.cs
+++ b/ProjectBus/ProjectBus/FormBoatsCollection.cs
@@ -1,6 +1,6 @@
-using Microsoft.Extensions.Logging;
-using ProjectBoat.CollectionGenericObjects;
+using ProjectBoat.CollectionGenericObjects;
 using ProjectBoat.Drawnings;
+using System.Windows.Forms;

 namespace ProjectBoat
 {
@@ -16,19 +16,13 @@ namespace ProjectBoat
        /// </summary>
        private AbstractCompany? _company = null;

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

        /// <summary>
@@ -41,11 +35,6 @@ namespace ProjectBoat
            panelCompanyTools.Enabled = false;
        }

-        /// <summary>
-        /// добавление лодки
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
        private void ButtonAddBoat_Click(object sender, EventArgs e)
        {
            FormBoatConfing form = new();
@@ -59,24 +48,21 @@ namespace ProjectBoat
        /// Добавление лодки в коллекцию
        /// </summary>
        /// <param name="boat"></param>
-        private void SetBoat(DrawningBoat? boat)
+        private void SetBoat(DrawningBoat boat)
        {
            if (_company == null || boat == null)
            {
                return;
            }
-            try
+
+            if (_company + boat != -1)
            {
-                var res = _company + boat;
                MessageBox.Show("Объект добавлен");
-                _logger.LogInformation($"Объект добавлен под индексом {res}");
                pictureBoxBoat.Image = _company.Show();
            }
-            catch (Exception ex)
+            else
            {
-                MessageBox.Show($"Объект не добавлен: {ex.Message}", "Результат", MessageBoxButtons.OK,
-                    MessageBoxIcon.Error);
-                _logger.LogError($"Ошибка: {ex.Message}", ex.Message);
+                MessageBox.Show("Не удалось добавить объект");
            }
        }

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

@@ -161,7 +143,8 @@ namespace ProjectBoat
        {
            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;
@@ -173,18 +156,8 @@ namespace ProjectBoat
            {
                collectionType = CollectionType.List;
            }
-
-            try
-            {
-                _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
-                _logger.LogInformation("Добавление коллекции");
-                RerfreshListBoxItems();
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                _logger.LogError($"Ошибка: {ex.Message}", ex.Message);
-            }
+            _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
+            RerfreshListBoxItems();
        }

        /// <summary>
@@ -204,7 +177,6 @@ namespace ProjectBoat
                return;
            }
            _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
-            _logger.LogInformation("Коллекция удалена");
            RerfreshListBoxItems();
        }

@@ -225,7 +197,7 @@ namespace ProjectBoat
        }

        /// <summary>
-        /// Создание компании
+        /// 
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
@@ -236,7 +208,6 @@ namespace ProjectBoat
                MessageBox.Show("Коллекция не выбрана");
                return;
            }
-
            ICollectionGenericObjects<DrawningBoat>? collection =
                _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
            if (collection == null)
@@ -244,63 +215,16 @@ namespace ProjectBoat
                MessageBox.Show("Коллекция не проинициализирована");
                return;
            }
-
            switch (comboBoxSelectorCompany.Text)
            {
                case "Хранилище":
                    _company = new BoatDockingService(pictureBoxBoat.Width, pictureBoxBoat.Height, collection);
-                    _logger.LogInformation("Компания создана");
                    break;
            }
            panelCompanyTools.Enabled = true;

        }

-        /// <summary>
-        /// Обработка нажатия "Сохранение"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void SaveToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            if (saveFileDialog.ShowDialog() == DialogResult.OK)
-            {
-                try
-                {
-                    _storageCollection.SaveData(saveFileDialog.FileName);
-                    MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                    _logger.LogInformation("Сохранение в файл: {filename}", saveFileDialog.FileName);
-                }
-                catch (Exception ex)
-                {
-                    MessageBox.Show(ex.Message, "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    _logger.LogError("Ошибка: {Message}", ex.Message);
-                }
-            }
-        }

-        /// <summary>
-        /// Обработка нажатия "Загрузка"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void LoadToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            if (openFileDialog.ShowDialog() == DialogResult.OK)
-            {
-                try
-                {
-                    _storageCollection.LoadData(openFileDialog.FileName);
-                    RerfreshListBoxItems();
-                    MessageBox.Show("Загрузка прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                    _logger.LogInformation("Загрузка из файла: {filename}", openFileDialog.FileName);
-                }
-                catch (Exception ex)
-                {
-                    MessageBox.Show("Загрузка не выполнена", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    _logger.LogError("Ошибка: {Message}", ex.Message);
-                }
-            }
-        }
    }
 }
--- a/ProjectBus/ProjectBus/FormBoatsCollection.resx
+++ b/ProjectBus/ProjectBus/FormBoatsCollection.resx
@@ -117,16 +117,4 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
-  <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 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/ProjectBus/ProjectBus/Program.cs
+++ b/ProjectBus/ProjectBus/Program.cs
@@ -1,8 +1,3 @@
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Serilog;
-
 namespace ProjectBoat
 {
    internal static class Program
@@ -15,31 +10,7 @@ namespace ProjectBoat
        {
            // 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<FormBoatsCollection>());
+            Application.Run(new FormBoatsCollection());
        }
-
-        private static void ConfigureServices(ServiceCollection services)
-        {
-            services.AddSingleton<FormBoatsCollection>().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/ProjectBus/ProjectBus/ProjectBoat.csproj
+++ b/ProjectBus/ProjectBus/ProjectBoat.csproj
@@ -2,21 +2,10 @@

  <PropertyGroup>
    <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
    <Nullable>enable</Nullable>
    <UseWindowsForms>true</UseWindowsForms>
    <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/ProjectBus/ProjectBus/ProjectBus.csproj
+++ b/ProjectBus/ProjectBus/ProjectBus.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.1" />
-    <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.12" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.2" />
-    <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
-  </ItemGroup>
-
 </Project>
--- a/ProjectBus/ProjectBus/nlog.config
+++ b/ProjectBus/ProjectBus/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="boatlog-
-${shortdate}.log" />
-		</targets>
-		<rules>
-			<logger name="*" minlevel="Debug" writeTo="tofile" />
-		</rules>
-	</nlog>
-</configuration>
--- a/ProjectBus/ProjectBus/serilogConfig.json
+++ b/ProjectBus/ProjectBus/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": "boat"
-    }
-  }
-}
Author	SHA1	Message	Date
Дима	96fdfe5e30	сru	2024-08-30 02:13:57 +04:00
Дима	0a2ce78a15	ы	2024-08-30 02:08:30 +04:00