LabWork05

ProjectMotorboat/ProjectMotorboat/BoatDelegate.cs

@@ -1,4 +1,10 @@
 using ProjectMotorboat.Drownings;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
 namespace ProjectMotorboat;
 
 public delegate void BoatDelegate(DrawningBoat car);

ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/AbstractCompany.cs

@@ -1,6 +1,5 @@
-
+using ProjectMotorboat.CollectionGenericObjects;
 using ProjectMotorboat.Drownings;
-using ProjectMotorboat.Exceptions;
 
 namespace ProjectMotorboat.CollectionGenericObjects;
 
@@ -17,14 +16,15 @@ public abstract class AbstractCompany
 
     protected ICollectionGenericObjects<DrawningBoat>? _collection = null;
 
+    
+    private int GetMaxCount => _pictureWidth * _pictureHeight / (_placeSizeWidth * _placeSizeHeight);
 
-    private int GetMaxCount => (_pictureWidth / _placeSizeWidth) * (_pictureHeight / _placeSizeHeight);
     public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects<DrawningBoat> collection)
     {
         _pictureWidth = picWidth;
         _pictureHeight = picHeight;
         _collection = collection;
-        _collection.MaxCount = GetMaxCount;
+        _collection.SetMaxCount = GetMaxCount;
     }
     public static int operator +(AbstractCompany company, DrawningBoat boat)
     {
@@ -49,15 +49,8 @@ public abstract class AbstractCompany
         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;

ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/CollectionType.cs

@@ -1,4 +1,10 @@
-namespace ProjectMotorboat.CollectionGenericObjects;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectMotorboat.CollectionGenericObjects;
 
 public enum CollectionType
 {

ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/HarborService.cs

@@ -1,5 +1,5 @@
-using ProjectMotorboat.Drownings;
-using ProjectMotorboat.Exceptions;
+using ProjectMotorboat.CollectionGenericObjects;
+using ProjectMotorboat.Drownings;
 
 namespace ProjectMotorboat.CollectionGenericObjects;
 
@@ -36,13 +36,12 @@ public class HarborService : AbstractCompany
 
         for (int i = 0; i < (_collection?.Count ?? 0); i++)
         {
-           try
+            if (_collection.Get(i) != null)
             {
                 _collection.Get(i).SetPictureSize(_pictureWidth, _pictureHeight);
                 _collection.Get(i).SetPosition(_placeSizeWidth * boatWidth + 20, boatHeight * _placeSizeHeight + 20);
             }
-            catch (ObjectNotFoundException) { }
-            catch (PositionOutOfCollectionException e) { }
+
             if (boatWidth < width - 1)
                 boatWidth++;
             else

ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -1,16 +1,20 @@
-namespace ProjectMotorboat.CollectionGenericObjects;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectMotorboat.CollectionGenericObjects;
 
 public interface ICollectionGenericObjects<T>
 
     where T : class
 {
     int Count { get; }
-    int MaxCount { get; set; }
+    int SetMaxCount { set; }
     int Insert(T obj);
     int Insert(T obj, int position);
     T Remove(int position);
     T? Get(int position);
-    CollectionType GetCollectionType { get; }
-    IEnumerable<T> GetItems();
 }
 

ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/ListGenericObjects.cs

@@ -1,74 +1,71 @@
-using ProjectMotorboat.Exceptions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
 namespace ProjectMotorboat.CollectionGenericObjects;
 
 public class ListGenericObjects<T> : ICollectionGenericObjects<T>
 
 where T : class
 {
-   
+    /// <summary>
+    /// Список объектов, которые храним
+    /// </summary>
     private readonly List<T?> _collection;
 
-    public CollectionType GetCollectionType => CollectionType.List;
-
-    
+    /// <summary>
+    /// Максимально допустимое число объектов в списке
+    /// </summary>
     private int _maxCount;
 
     public int Count => _collection.Count;
 
-    public int MaxCount
-    {
-        get
-        {
-            return Count;
-        }
-        set
-        {
-            if (value > 0)
-            {
-                _maxCount = value;
-            }
-        }
-    }
+    public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } }
 
+    /// <summary>
+    /// Конструктор
+    /// </summary>
     public ListGenericObjects()
     {
         _collection = new();
     }
 
-    public T Get(int position)
+    public T? Get(int position)
     {
-        if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position);
+        // TODO проверка позиции
+        if (position >= Count || position < 0) return null;
         return _collection[position];
     }
+
     public int Insert(T obj)
     {
-        if (Count == _maxCount) throw new CollectionOverflowException(Count);
+        // TODO проверка, что не превышено максимальное количество элементов
+        // TODO вставка в конец набора
+        if (Count + 1 > _maxCount) return -1;
         _collection.Add(obj);
         return Count;
     }
 
     public int Insert(T obj, int position)
     {
-        if (Count == _maxCount) throw new CollectionOverflowException(Count);
-        if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position);
+        // TODO проверка, что не превышено максимальное количество элементов
+        // TODO проверка позиции
+        // TODO вставка по позиции
+        if (Count + 1 > _maxCount) return -1;
+        if (position < 0 || position > Count) return -1;
         _collection.Insert(position, obj);
-        return position;
+        return 1;
     }
 
-    public T Remove(int position)
+    public T? Remove(int position)
     {
-
-        if (position >= _collection.Count || position < 0) throw new PositionOutOfCollectionException(position);
-        T obj = _collection[position];
+        // TODO проверка позиции
+        // TODO удаление объекта из списка
+        if (position < 0 || position > Count) return null;
+        T? pos = _collection[position];
         _collection.RemoveAt(position);
-        return obj;
-    }
-
-    public IEnumerable<T> GetItems()
-    {
-        for (int i = 0; i < Count; ++i)
-        {
-            yield return _collection[i];
-        }
+        return pos;
     }
 }

ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -1,27 +1,17 @@
-
-
-using ProjectMotorboat.Exceptions;
-
-namespace ProjectMotorboat.CollectionGenericObjects;
+namespace ProjectMotorboat.CollectionGenericObjects;
 public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
     where T : class
 {
-
+   
     private T?[] _collection;
-
     public int Count => _collection.Length;
-
-    public int MaxCount
+    public int SetMaxCount
     {
-        get
-        {
-            return _collection.Length;
-        }
         set
         {
             if (value > 0)
             {
-                if (Count > 0)
+                if (_collection.Length > 0)
                 {
                     Array.Resize(ref _collection, value);
                 }
@@ -32,9 +22,7 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
             }
         }
     }
-
-    public CollectionType GetCollectionType => CollectionType.Massive;
-
+    
     public MassiveGenericObjects()
     {
         _collection = Array.Empty<T?>();
@@ -42,13 +30,15 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
 
     public T? Get(int position)
     {
-        if (position < 0 || position >= Count) throw new PositionOutOfCollectionException(position);
-        if (_collection[position] == null) throw new ObjectNotFoundException(position);
+        if (position < 0 || position >= _collection.Length)
+        {
+            return null;
+        }
         return _collection[position];
     }
     public int Insert(T obj)
     {
-        for (int i = 0; i < Count; i++)
+        for (int i = 0; i < _collection.Length; i++)
         {
             if (_collection[i] == null)
             {
@@ -57,66 +47,51 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
             }
         }
 
-        throw new CollectionOverflowException(Count);
+        return -1;
     }
     public int Insert(T obj, int position)
     {
-        if (position < 0 || position >= Count) throw new PositionOutOfCollectionException(position);
+        if (position < 0 || position >= _collection.Length) { return position; }
 
-        if (_collection[position] != null)
+        if (_collection[position] == null)
         {
-            bool pushed = false;
-            for (int index = position + 1; index < Count; index++)
+            _collection[position] = obj;
+            return position;
+        }
+        else
+        {
+            for (int i = position + 1; i < _collection.Length; i++)
             {
-                if (_collection[index] == null)
+                if (_collection[i] == null)
                 {
-                    position = index;
-                    pushed = true;
-                    break;
+                    _collection[i] = obj;
+                    return i;
                 }
             }
 
-            if (!pushed)
+            for (int i = position - 1; i >= 0; i--)
             {
-                for (int index = position - 1; index >= 0; index--)
+                if (_collection[i] == null)
                 {
-                    if (_collection[index] == null)
-                    {
-                        position = index;
-                        pushed = true;
-                        break;
-                    }
+                    _collection[i] = obj;
+                    return i;
                 }
             }
-
-            if (!pushed)
-            {
-                throw new CollectionOverflowException(Count);
-            }
         }
-        _collection[position] = obj;
-        return position;
+
+        return -1;
     }
     public T Remove(int position)
     {
-        if (position < 0 || position >= Count) throw new PositionOutOfCollectionException(position);
-
-        if (_collection[position] == null) throw new ObjectNotFoundException(position);
-
-        T? temp = _collection[position];
-        _collection[position] = null;
-        return temp;
-    }
-
-    public IEnumerable<T> GetItems()
-    {
-        for (int i = 0; i < _collection.Length; ++i)
+        if (position < 0 || position >= _collection.Length)
         {
-            yield return _collection[i];
+            return null;
         }
+
+        T? obj = _collection[position];
+        _collection[position] = null;
+
+        return obj;
     }
 }
 
-
-
-

ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/StorageCollection.cs

@@ -1,13 +1,16 @@
-using ProjectMotorboat.Drownings;
-using ProjectMotorboat.Exceptions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Text;
+using System.Threading.Tasks;
+
 namespace ProjectMotorboat.CollectionGenericObjects;
 
 public class StorageCollection<T>
-    where T : DrawningBoat
+    where T : class
 {
-
-    private Dictionary<string, ICollectionGenericObjects<T>> _storages;
+    
+    readonly Dictionary<string, ICollectionGenericObjects<T>> _storages;
 
     public List<string> Keys => _storages.Keys.ToList();
 
@@ -16,9 +19,11 @@ public class StorageCollection<T>
         _storages = new Dictionary<string, ICollectionGenericObjects<T>>();
     }
 
-
+    
     public void AddCollection(string name, CollectionType collectionType)
     {
+        // TODO проверка, что name не пустой и нет в словаре записи с таким ключом
+        // TODO Прописать логику для добавления
         if (name == null || _storages.ContainsKey(name)) { return; }
         switch (collectionType)
 
@@ -34,7 +39,7 @@ public class StorageCollection<T>
         }
     }
 
-
+   
     public void DelCollection(string name)
     {
         // TODO Прописать логику для удаления коллекции
@@ -42,7 +47,7 @@ public class StorageCollection<T>
             _storages.Remove(name);
     }
 
-
+   
     public ICollectionGenericObjects<T>? this[string name]
     {
         get
@@ -52,131 +57,4 @@ public class StorageCollection<T>
             return _storages[name];
         }
     }
-
-    private readonly string _collectionKey = "CollectionsStorage";
-
-    private readonly string _separatorForKeyValue = "|";
-
-    private readonly string _separatorItems = ";";
-
-    /// <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 (StreamWriter writer = new StreamWriter(filename))
-        {
-            writer.Write(_collectionKey);
-            foreach (KeyValuePair<string, ICollectionGenericObjects<T>> value in _storages)
-            {
-                StringBuilder sb = new();
-                sb.Append(Environment.NewLine);
-                if (value.Value.Count == 0)
-                {
-                    continue;
-                }
-                sb.Append(value.Key);
-                sb.Append(_separatorForKeyValue);
-                sb.Append(value.Value.GetCollectionType);
-                sb.Append(_separatorForKeyValue);
-                sb.Append(value.Value.MaxCount);
-                sb.Append(_separatorForKeyValue);
-                foreach (T? item in value.Value.GetItems())
-                {
-                    string data = item?.GetDataForSave() ?? string.Empty;
-                    if (string.IsNullOrEmpty(data))
-                    {
-                        continue;
-                    }
-                    sb.Append(data);
-                    sb.Append(_separatorItems);
-                }
-                writer.Write(sb);
-            }
-
-        }
-
-    }
-
-    /// <summary>
-    /// Загрузка информации по автомобилям в хранилище из файла
-    /// </summary>
-    /// <param name="filename">Путь и имя файла</param>
-    /// <returns>true - загрузка прошла успешно, false - ошибка при загрузке данных</returns>
-    public void LoadData(string filename)
-    {
-        if (!File.Exists(filename))
-        {
-            throw new Exception("Файл не существует");
-        }
-        using (StreamReader fs = File.OpenText(filename))
-        {
-            string str = fs.ReadLine();
-            if (str == null || str.Length == 0)
-            {
-                throw new Exception("В файле нет данных");
-            }
-            if (!str.StartsWith(_collectionKey))
-            {
-                throw new Exception("В файле неверные данные");
-            }
-            _storages.Clear();
-            string strs = "";
-            while ((strs = fs.ReadLine()) != null)
-            {
-
-                string[] record = strs.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
-                if (record.Length != 4)
-                {
-                    continue;
-                }
-                CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]);
-                ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionType);
-                if (collection == null)
-                {
-                    throw new Exception("Не удалось создать коллекцию");
-                }
-                collection.MaxCount = Convert.ToInt32(record[2]);
-                string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
-                foreach (string elem in set)
-                {
-                    if (elem?.CreateDrawningBoat() is T track)
-                    {
-                        try
-                        {
-                            if (collection.Insert(track) == -1)
-                            {
-                                throw new Exception("Объект не удалось добавить в коллекцию: " + record[3]);
-                            }
-                        }
-                        catch (CollectionOverflowException ex)
-                        {
-                            throw new Exception("Коллекция переполнена", ex);
-                        }
-                    }
-                }
-                _storages.Add(record[0], collection);
-            }
-
-        }
-    }
-    private static ICollectionGenericObjects<T>? CreateCollection(CollectionType collectionType)
-    {
-        return collectionType switch
-        {
-            CollectionType.Massive => new MassiveGenericObjects<T>(),
-            CollectionType.List => new ListGenericObjects<T>(),
-            _ => null,
-        };
-    }
-}
+}

ProjectMotorboat/ProjectMotorboat/Drownings/DirectionType.cs

@@ -1,4 +1,8 @@
-
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace ProjectMotorboat.Drownings
 {

ProjectMotorboat/ProjectMotorboat/Drownings/DrawningBoat.cs

@@ -1,5 +1,9 @@
 using ProjectMotorboat.Entities;
-
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace ProjectMotorboat.Drownings;
 
@@ -47,11 +51,6 @@ public class DrawningBoat
         _drawningBoatHeight = drawningBoatHeight;
         
     }
-
-    public DrawningBoat(EntityBoat ship) : this()
-    {
-        EntityBoat = new EntityBoat(ship.Speed, ship.Weight, ship.BodyColor);
-    }
     public bool SetPictureSize(int width, int height)
     {
         if (_drawningBoatWidth < width && _drawningBoatHeight < height)
@@ -110,28 +109,28 @@ public class DrawningBoat
         }
         switch (direction)
         {
-            
+            //влево
             case DirectionType.Left:
                 if (_startPosX.Value - EntityBoat.Step > 0)
                 {
                     _startPosX -= (int)EntityBoat.Step;
                 }
                 return true;
-            
+            //вверх
             case DirectionType.Up:
                 if (_startPosY.Value - EntityBoat.Step > 0)
                 {
                     _startPosY -= (int)EntityBoat.Step;
                 }
                 return true;
-           
+            // вправо
             case DirectionType.Right:
                 if (_startPosX.Value + EntityBoat.Step + _drawningBoatWidth < _pictureWidth)
                 {
                     _startPosX += (int)EntityBoat.Step;
                 }
                 return true;
-      
+            //вниз
             case DirectionType.Down:
                 if (_startPosY.Value + EntityBoat.Step + _drawningBoatHeight < _pictureHeight)
                 {
@@ -151,7 +150,7 @@ public class DrawningBoat
         Pen pen = new(Color.Black);
         Brush mainBrush = new SolidBrush(EntityBoat.BodyColor);
 
-        
+        // корпус
         Point[] hull = new Point[]
         {
                 new Point(_startPosX.Value + 5, _startPosY.Value + 0),
@@ -163,7 +162,7 @@ public class DrawningBoat
         g.FillPolygon(mainBrush, hull);
         g.DrawPolygon(pen, hull);
 
-        
+        // основная часть
         Brush blockBrush = new SolidBrush(EntityBoat.BodyColor);
         g.FillRectangle(blockBrush, _startPosX.Value + 20, _startPosY.Value + 15, 80, 40);
         g.DrawRectangle(pen, _startPosX.Value + 20, _startPosY.Value + 15, 80, 40);

ProjectMotorboat/ProjectMotorboat/Drownings/DrawningMotorboat.cs

@@ -9,12 +9,6 @@ public class DrawningMotorboat : DrawningBoat
         EntityBoat = new EntityMotorboat(speed, weight, bodyColor, additionalColor, motor, glass);
         
     }
-
-    public DrawningMotorboat(EntityMotorboat boat) : base(129, 80)
-    {
-        EntityBoat = new EntityMotorboat(boat.Speed, boat.Weight, boat.BodyColor, boat.AdditionalColor, boat.Motor, boat.Glass);
-    }
-
     public override void DrawTransport(Graphics g)
     {
         if (EntityBoat == null || EntityBoat is not EntityMotorboat motorboat|| !_startPosX.HasValue || !_startPosY.HasValue)
@@ -26,12 +20,15 @@ public class DrawningMotorboat : DrawningBoat
         Brush additionalBrush = new SolidBrush(motorboat.AdditionalColor);
 
         base.DrawTransport(g);
+
+        // стекло впереди
         if (motorboat.Glass)
         {
             Brush glassBrush = new SolidBrush(Color.LightBlue);
             g.FillEllipse(glassBrush, _startPosX.Value + 20, _startPosY.Value + 15, 100, 40);
             g.DrawEllipse(pen, _startPosX.Value + 20, _startPosY.Value + 15, 100, 40);
         }
+        // двигатель 
         if (motorboat.Motor)
         {
             Brush engineBrush = new

ProjectMotorboat/ProjectMotorboat/Drownings/ExtentionDrawningBoat.cs

@@ -1,40 +0,0 @@
-using ProjectMotorboat.Entities;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectMotorboat.Drownings;
-public static class ExtentionDrawningBoat
-{
-    private static readonly string _separatorForObject = ":";
-
-    public static DrawningBoat? CreateDrawningBoat(this string info)
-    {
-        string[] strs = info.Split(_separatorForObject);
-        EntityBoat? boat = EntityMotorboat.CreateEntityMotorboat(strs);
-        if (boat != null)
-        {
-            return new DrawningMotorboat((EntityMotorboat)boat);
-        }
-
-        boat = EntityBoat.CreateEntityBoat(strs);
-        if (boat != null)
-        {
-            return new DrawningBoat(boat);
-        }
-        return null;
-    }
-    public static string GetDataForSave(this DrawningBoat drawningBoat)
-    {
-        string[]? array = drawningBoat?.EntityBoat?.GetStringRepresentation();
-
-        if (array == null)
-        {
-            return string.Empty;
-        }
-
-        return string.Join(_separatorForObject, array);
-    }
-}

ProjectMotorboat/ProjectMotorboat/Entities/EntityBoat.cs

@@ -1,4 +1,10 @@
-namespace ProjectMotorboat.Entities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectMotorboat.Entities;
 
 public class EntityBoat
 {
@@ -20,17 +26,4 @@ public class EntityBoat
         Weight = weight;
         BodyColor = bodyColor;
     }
-    public virtual string[] GetStringRepresentation()
-    {
-        return new[] { nameof(EntityBoat), Speed.ToString(), Weight.ToString(), BodyColor.Name };
-    }
-    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]));
-    }
 }

ProjectMotorboat/ProjectMotorboat/Entities/EntityMotorboat.cs

@@ -20,12 +20,4 @@ public class EntityMotorboat : EntityBoat
         Motor = motor;
         Glass = glass;
     }
-    public static EntityMotorboat? CreateEntityMotorboat(string[] strs)
-    {
-        if (strs.Length != 8 || strs[0] != nameof(EntityMotorboat))
-        {
-            return null;
-        }
-        return new EntityMotorboat(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]), Color.FromName(strs[4]), Convert.ToBoolean(strs[5]), Convert.ToBoolean(strs[6]));
-    }
 }

ProjectMotorboat/ProjectMotorboat/Exceptions/CollectionOverflowException.cs

@@ -1,18 +0,0 @@
-
-using System.Runtime.Serialization;
-
-namespace ProjectMotorboat.Exceptions;
-
-[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) { }
-}

ProjectMotorboat/ProjectMotorboat/Exceptions/ObjectNotFoundException.cs

@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Serialization;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectMotorboat.Exceptions;
-[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) { }
-}

ProjectMotorboat/ProjectMotorboat/Exceptions/PositionOutOfCollectionException.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 ProjectMotorboat.Exceptions;
-[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) { }
-}

ProjectMotorboat/ProjectMotorboat/FormBoatCollection.Designer.cs

@@ -46,17 +46,10 @@
             labelCollectionName = new Label();
             comboBoxSelectorCompany = new ComboBox();
             pictureBox = new PictureBox();
-            menuStrip = new MenuStrip();
-            файлToolStripMenuItem = new ToolStripMenuItem();
-            saveToolStripMenuItem = new ToolStripMenuItem();
-            loadToolStripMenuItem = new ToolStripMenuItem();
-            saveFileDialog = new SaveFileDialog();
-            openFileDialog = new OpenFileDialog();
             groupBoxTools.SuspendLayout();
             panelCompanyTools.SuspendLayout();
             panelStorage.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
-            menuStrip.SuspendLayout();
             SuspendLayout();
             // 
             // groupBoxTools
@@ -66,9 +59,9 @@
             groupBoxTools.Controls.Add(panelStorage);
             groupBoxTools.Controls.Add(comboBoxSelectorCompany);
             groupBoxTools.Dock = DockStyle.Right;
-            groupBoxTools.Location = new Point(1096, 28);
+            groupBoxTools.Location = new Point(1027, 0);
             groupBoxTools.Name = "groupBoxTools";
-            groupBoxTools.Size = new Size(231, 793);
+            groupBoxTools.Size = new Size(231, 746);
             groupBoxTools.TabIndex = 0;
             groupBoxTools.TabStop = false;
             groupBoxTools.Text = "Инструменты";
@@ -82,15 +75,15 @@
             panelCompanyTools.Controls.Add(buttonGoToCheck);
             panelCompanyTools.Dock = DockStyle.Bottom;
             panelCompanyTools.Enabled = false;
-            panelCompanyTools.Location = new Point(3, 486);
+            panelCompanyTools.Location = new Point(3, 418);
             panelCompanyTools.Name = "panelCompanyTools";
-            panelCompanyTools.Size = new Size(225, 304);
+            panelCompanyTools.Size = new Size(225, 325);
             panelCompanyTools.TabIndex = 7;
             // 
             // buttonAddBoat
             // 
             buttonAddBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonAddBoat.Location = new Point(6, 7);
+            buttonAddBoat.Location = new Point(3, 3);
             buttonAddBoat.Name = "buttonAddBoat";
             buttonAddBoat.Size = new Size(219, 54);
             buttonAddBoat.TabIndex = 1;
@@ -100,7 +93,7 @@
             // 
             // maskedTextBox
             // 
-            maskedTextBox.Location = new Point(3, 67);
+            maskedTextBox.Location = new Point(3, 123);
             maskedTextBox.Mask = "00";
             maskedTextBox.Name = "maskedTextBox";
             maskedTextBox.Size = new Size(219, 27);
@@ -110,7 +103,7 @@
             // buttonRefresh
             // 
             buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRefresh.Location = new Point(3, 220);
+            buttonRefresh.Location = new Point(3, 276);
             buttonRefresh.Name = "buttonRefresh";
             buttonRefresh.Size = new Size(219, 54);
             buttonRefresh.TabIndex = 6;
@@ -121,7 +114,7 @@
             // buttonDelBoat
             // 
             buttonDelBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonDelBoat.Location = new Point(3, 100);
+            buttonDelBoat.Location = new Point(3, 156);
             buttonDelBoat.Name = "buttonDelBoat";
             buttonDelBoat.Size = new Size(222, 54);
             buttonDelBoat.TabIndex = 4;
@@ -132,7 +125,7 @@
             // buttonGoToCheck
             // 
             buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonGoToCheck.Location = new Point(3, 160);
+            buttonGoToCheck.Location = new Point(3, 216);
             buttonGoToCheck.Name = "buttonGoToCheck";
             buttonGoToCheck.Size = new Size(219, 54);
             buttonGoToCheck.TabIndex = 5;
@@ -246,58 +239,19 @@
             // pictureBox
             // 
             pictureBox.Dock = DockStyle.Fill;
-            pictureBox.Location = new Point(0, 28);
+            pictureBox.Location = new Point(0, 0);
             pictureBox.Name = "pictureBox";
-            pictureBox.Size = new Size(1096, 793);
+            pictureBox.Size = new Size(1027, 746);
             pictureBox.TabIndex = 1;
             pictureBox.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(1327, 28);
-            menuStrip.TabIndex = 2;
-            menuStrip.Text = "menuStrip";
-            // 
-            // файл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";
-            // 
             // FormBoatCollection
             // 
             AutoScaleDimensions = new SizeF(8F, 20F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(1327, 821);
+            ClientSize = new Size(1258, 746);
             Controls.Add(pictureBox);
             Controls.Add(groupBoxTools);
-            Controls.Add(menuStrip);
-            MainMenuStrip = menuStrip;
             Name = "FormBoatCollection";
             Text = "Коллекция лодок";
             groupBoxTools.ResumeLayout(false);
@@ -306,10 +260,7 @@
             panelStorage.ResumeLayout(false);
             panelStorage.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
-            menuStrip.ResumeLayout(false);
-            menuStrip.PerformLayout();
             ResumeLayout(false);
-            PerformLayout();
         }
 
         #endregion
@@ -332,11 +283,5 @@
         private Button buttonCollectionDel;
         private Button buttonCreateCompany;
         private Panel panelCompanyTools;
-        private MenuStrip menuStrip;
-        private ToolStripMenuItem файлToolStripMenuItem;
-        private ToolStripMenuItem saveToolStripMenuItem;
-        private ToolStripMenuItem loadToolStripMenuItem;
-        private SaveFileDialog saveFileDialog;
-        private OpenFileDialog openFileDialog;
     }
 }

ProjectMotorboat/ProjectMotorboat/FormBoatCollection.cs

@@ -1,62 +1,83 @@
-using Microsoft.Extensions.Logging;
-using ProjectMotorboat.CollectionGenericObjects;
+using ProjectMotorboat.CollectionGenericObjects;
 using ProjectMotorboat.Drownings;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement.TrackBar;
 
 namespace ProjectMotorboat;
 
+/// <summary>
+/// Форма работы с компанией и ее коллекцией
+/// </summary>
 public partial class FormBoatCollection : Form
-{
+{ 
     private readonly StorageCollection<DrawningBoat> _storageCollection;
 
+    /// <summary>
+    /// Компания
+    /// </summary>
     private AbstractCompany? _company = null;
 
-    private readonly ILogger _logger;
-
-    public FormBoatCollection(ILogger<FormBoatCollection> logger)
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public FormBoatCollection()
     {
         InitializeComponent();
         _storageCollection = new();
-        _logger = logger;
-        _logger.LogInformation("Форма загрузилась");
     }
 
-
+    /// <summary>
+    /// Выбор компании
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
     private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
     {
         panelCompanyTools.Enabled = false;
     }
 
-
+    /// <summary>
+    /// Добавление обычного автомобиля
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
     private void ButtonAddBoat_Click(object sender, EventArgs e)
     {
         FormBoatConfig form = new();
-        form.Show();
+        // TODO передать метод
         form.AddEvent(SetBoat);
 
+        form.Show();
     }
-    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}");
             pictureBox.Image = _company.Show();
         }
-        catch (Exception ex)
+        else
         {
-            MessageBox.Show($"Объект не добавлен: {ex.Message}", "Результат", MessageBoxButtons.OK,
-                MessageBoxIcon.Error);
-            _logger.LogError($"Ошибка: {ex.Message}", ex.Message);
+            MessageBox.Show("Не удалось добавить объект");
         }
+
     }
 
 
+
+    /// <summary>
+    /// Создание объекта класса-перемещения
+    /// </summary>
+    /// <param name="type">Тип создаваемого объекта</param>
+
+    /// <summary>
+    /// Удаление объекта
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
     private void ButtonRemoveBoat_Click(object sender, EventArgs e)
     {
         if (string.IsNullOrEmpty(maskedTextBox.Text) || _company == null)
@@ -64,30 +85,28 @@ public partial class FormBoatCollection : Form
             return;
         }
 
-        if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) !=
-            DialogResult.Yes)
+        if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
         {
             return;
         }
 
         int pos = Convert.ToInt32(maskedTextBox.Text);
-        try
+        if (_company - pos != null)
         {
-            var res = _company - pos;
             MessageBox.Show("Объект удален");
-            _logger.LogInformation($"Объект удален под индексом {pos}");
             pictureBox.Image = _company.Show();
         }
-        catch (Exception ex)
+        else
         {
-            MessageBox.Show(ex.Message, "Не удалось удалить объект",
-                MessageBoxButtons.OK, MessageBoxIcon.Error);
-            _logger.LogError($"Ошибка: {ex.Message}", ex.Message);
+            MessageBox.Show("Не удалось удалить объект");
         }
     }
 
-
-
+    /// <summary>
+    /// Передача объекта в другую форму
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
     private void ButtonGoToCheck_Click(object sender, EventArgs e)
     {
         if (_company == null)
@@ -106,10 +125,12 @@ public partial class FormBoatCollection : Form
                 break;
             }
         }
+
         if (boat == null)
         {
             return;
         }
+
         FormMotorboat form = new()
         {
             SetBoat = boat
@@ -117,7 +138,11 @@ public partial class FormBoatCollection : Form
         form.ShowDialog();
     }
 
-
+    /// <summary>
+    /// Перерисовка коллекции
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
     private void ButtonRefresh_Click(object sender, EventArgs e)
     {
         if (_company == null)
@@ -130,8 +155,7 @@ public partial class FormBoatCollection : Form
 
     private void ButtonCollectionAdd_Click(object sender, EventArgs e)
     {
-        if (string.IsNullOrEmpty(textBoxCollectionName.Text) ||
-            (!radioButtonList.Checked && !radioButtonMassive.Checked))
+        if (string.IsNullOrEmpty(textBoxCollectionName.Text) || (!radioButtonList.Checked && !radioButtonMassive.Checked))
         {
             MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
             return;
@@ -147,36 +171,22 @@ public partial class FormBoatCollection : Form
             collectionType = CollectionType.List;
         }
 
-        try
-        {
-            _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
-            _logger.LogInformation("Добавление коллекции");
-            RerfreshListBoxItems();
-        }
-        catch (Exception ex)
-        {
-            MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            _logger.LogError($"Ошибка: {ex.Message}", ex.Message);
-        }
-
+        _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
+        RerfreshListBoxItems();
     }
 
     private void ButtonCollectionDel_Click(object sender, EventArgs e)
     {
-        if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
+        if (listBoxCollection.SelectedItem == null)
         {
             MessageBox.Show("Коллекция не выбрана");
             return;
         }
-
-        if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) !=
-            DialogResult.Yes)
+        if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
         {
             return;
         }
-
         _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
-        _logger.LogInformation("Коллекция удалена");
         RerfreshListBoxItems();
     }
 
@@ -201,8 +211,7 @@ public partial class FormBoatCollection : Form
             return;
         }
 
-        ICollectionGenericObjects<DrawningBoat>? collection =
-            _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
+        ICollectionGenericObjects<DrawningBoat>? collection = _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
         if (collection == null)
         {
             MessageBox.Show("Коллекция не проинициализирована");
@@ -213,48 +222,10 @@ public partial class FormBoatCollection : Form
         {
             case "Хранилище":
                 _company = new HarborService(pictureBox.Width, pictureBox.Height, collection);
-                _logger.LogInformation("Компания создана");
                 break;
         }
 
         panelCompanyTools.Enabled = true;
         RerfreshListBoxItems();
     }
-    private void SaveToolStripMenuItem_Click(object sender, EventArgs e)
-    {
-        if (saveFileDialog.ShowDialog() == DialogResult.OK)
-        {
-            try
-            {
-                _storageCollection.SaveData(saveFileDialog.FileName);
-                MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                _logger.LogInformation("Сохранение в файл: {filename}", saveFileDialog.FileName);
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show("Не сохранилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                _logger.LogError("Ошибка: {Message}", ex.Message);
-            }
-        }
-    }
-
-    private void LoadToolStripMenuItem_Click(object sender, EventArgs e)
-    {
-        if (openFileDialog.ShowDialog() == DialogResult.OK)
-        {
-            try
-            {
-                _storageCollection.LoadData(openFileDialog.FileName);
-                RerfreshListBoxItems();
-                MessageBox.Show("Загрузка прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                _logger.LogInformation("Загрузка из файла: {filename}", openFileDialog.FileName);
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show("Загрузка не выполнена", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                _logger.LogError("Ошибка: {Message}", ex.Message);
-            }
-        }
-    }
-
-}
+}

ProjectMotorboat/ProjectMotorboat/FormBoatCollection.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, 17</value>
-  </metadata>
-  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>145, 17</value>
-  </metadata>
-  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>310, 17</value>
-  </metadata>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>51</value>
-  </metadata>
 </root>

ProjectMotorboat/ProjectMotorboat/FormBoatConfig.cs

@@ -1,5 +1,15 @@
 using ProjectMotorboat.Drownings;
 using ProjectMotorboat.Entities;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
 namespace ProjectMotorboat
 {
     public partial class FormBoatConfig : Form
@@ -71,9 +81,11 @@ namespace ProjectMotorboat
 
         private void Panel_MouseDown(object? sender, MouseEventArgs e)
         {
+            // TODO отправка цвета в Drag&Drop
             (sender as Control)?.DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy);
 
         }
+        // Логика смены цветов: основного и дополнительного (для продвинутого объекта)
         private void LabelBodyColor_DragEnter(object sender, DragEventArgs e)
         {
             if (e.Data?.GetDataPresent(typeof(Color)) ?? false)

ProjectMotorboat/ProjectMotorboat/MovementStrategy/AbstractStrategy.cs

@@ -1,4 +1,9 @@
-
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
 namespace ProjectMotorboat.MovementStrategy;
 
 

ProjectMotorboat/ProjectMotorboat/MovementStrategy/IMoveableObject.cs

@@ -1,4 +1,8 @@
-
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace ProjectMotorboat.MovementStrategy;
 

ProjectMotorboat/ProjectMotorboat/MovementStrategy/MoveToBorder.cs

@@ -1,4 +1,8 @@
-
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace ProjectMotorboat.MovementStrategy;
 public class MoveToBorder : AbstractStrategy

ProjectMotorboat/ProjectMotorboat/MovementStrategy/MoveToCenter.cs

@@ -1,4 +1,9 @@
-
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
 namespace ProjectMotorboat.MovementStrategy;
 public class MoveToCenter : AbstractStrategy
 {

ProjectMotorboat/ProjectMotorboat/MovementStrategy/MoveableBoat.cs

@@ -1,5 +1,9 @@
 using ProjectMotorboat.Drownings;
-
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace ProjectMotorboat.MovementStrategy;
 

ProjectMotorboat/ProjectMotorboat/MovementStrategy/MovementDirection.cs

@@ -1,4 +1,10 @@
-namespace ProjectMotorboat.MovementStrategy;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectMotorboat.MovementStrategy;
 
 public enum MovementDirection
 {

ProjectMotorboat/ProjectMotorboat/MovementStrategy/ObjectParameters.cs

@@ -1,4 +1,10 @@
-namespace ProjectMotorboat.MovementStrategy;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectMotorboat.MovementStrategy;
 
 public class ObjectParameters
 {

ProjectMotorboat/ProjectMotorboat/MovementStrategy/StrategyStatus.cs

@@ -1,4 +1,9 @@
-
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
 namespace ProjectMotorboat.MovementStrategy;
 
 public enum StrategyStatus

ProjectMotorboat/ProjectMotorboat/Program.cs

@@ -1,43 +1,17 @@
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Serilog;
-
-namespace ProjectMotorboat;
-
-internal static class Program
+namespace ProjectMotorboat
 {
-    [STAThread]
-    static void Main()
+    internal static class Program
     {
-        // To customize application configuration such as set high DPI settings or default font,
-        // see https://aka.ms/applicationconfiguration.
-        ApplicationConfiguration.Initialize();
-        var services = new ServiceCollection();
-        ConfigureServices(services);
-        using (ServiceProvider serviceProvider = services.BuildServiceProvider())
+        /// <summary>
+        ///  The main entry point for the application.
+        /// </summary>
+        [STAThread]
+        static void Main()
         {
-            Application.Run(serviceProvider.GetRequiredService<FormBoatCollection>());
+            // To customize application configuration such as set high DPI settings or default font,
+            // see https://aka.ms/applicationconfiguration.
+            ApplicationConfiguration.Initialize();
+            Application.Run(new FormBoatCollection());
         }
     }
-
-    private static void ConfigureServices(ServiceCollection services)
-    {
-        services.AddSingleton<FormBoatCollection>().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);
-        });
-    }
 }

ProjectMotorboat/ProjectMotorboat/ProjectMotorboat.csproj

@@ -8,19 +8,4 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
-    <PackageReference Include="NLog" Version="5.3.2" />
-    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.10" />
-    <PackageReference Include="Serilog" Version="3.1.1" />
-    <PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="serilogConfig.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
 </Project>

ProjectMotorboat/ProjectMotorboat/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": "Motorboat"
-    }
-  }
-}