ProjectSeaplane/ProjectSeaplane/CollectionGenericObjects/AbstractCompany.cs

@@ -49,12 +49,8 @@ public abstract class AbstractCompany
         SetObjectsPosition();
         for (int i = 0; i < (_collection?.Count ?? 0); ++i)
         {
-            try
-            {
-                DrawingPlane? obj = _collection?.Get(i);
-                obj?.DrawTransport(graphics);
-            }
-            catch (Exception) { }
+            DrawingPlane? obj = _collection?.Get(i);
+            obj?.DrawTransport(graphics);
         }
 
         return bitmap;

ProjectSeaplane/ProjectSeaplane/CollectionGenericObjects/ListGenericObjects.cs

@@ -1,6 +1,4 @@
-using ProjectSeaplane.Exceptions;
-
-namespace ProjectSeaplane.CollectionGenericObjects;
+namespace ProjectSeaplane.CollectionGenericObjects;
 
 public class ListGenericObjects<T> : ICollectionGenericObjects<T>
     where T : class
@@ -35,26 +33,26 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
 
     public T? Get(int position)
     {
-        if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position);
+        if (position >= Count || position < 0) return null;
         return _collection[position];
     }
 
     public int Insert(T obj)
     {
-        if (Count == _maxCount) throw new CollectionOverflowException(Count);
+        if (Count == _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);
+        if (Count == _maxCount) return -1;
+        if (position >= Count || position < 0) return -1;
         _collection.Insert(position, obj);
         return position;
     }
     public T Remove(int position)
     {
-        if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position);
+        if (position >= Count || position < 0) return null;
         T obj = _collection[position];
         _collection.RemoveAt(position);
         return obj;

ProjectSeaplane/ProjectSeaplane/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -1,6 +1,4 @@
-using ProjectSeaplane.Exceptions;
-
-namespace ProjectSeaplane.CollectionGenericObjects;
+namespace ProjectSeaplane.CollectionGenericObjects;
 
 public class MassiveGenericObjects<T> : ICollectionGenericObjects<T> 
     where T : class
@@ -40,8 +38,7 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
 
     public T? Get(int position)
     {
-        if (position >= _collection.Length || position < 0) throw new PositionOutOfCollectionException(position);
-        if (_collection[position] == null) throw new ObjectNotFoundException(position);
+        if (position >= _collection.Length || position < 0) return null;
         return _collection[position];
     }
 
@@ -57,11 +54,12 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
             }
             ++index;
         }
-        throw new CollectionOverflowException(Count);
+        return -1;
     }
     public int Insert(T obj, int position)
     {
-        if (position >= _collection.Length || position < 0) throw new PositionOutOfCollectionException(position);
+        if (position >= _collection.Length || position < 0)
+            return -1;
         if (_collection[position] == null)
         {
             _collection[position] = obj;
@@ -87,12 +85,12 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
             }
             --index;
         }
-        throw new CollectionOverflowException(Count);
+        return -1;
     }
     public T Remove(int position)
     {
-        if (position >= _collection.Length || position < 0) throw new PositionOutOfCollectionException(position);
-        if (_collection[position] == null) throw new ObjectNotFoundException(position);
+        if (position >= _collection.Length || position < 0)
+            return null;
         T obj = _collection[position];
         _collection[position] = null;
         return obj;

ProjectSeaplane/ProjectSeaplane/CollectionGenericObjects/PlaneSharingService.cs

@@ -32,12 +32,11 @@ internal class PlaneSharingService : AbstractCompany
 
         for (int i = 0; i < (_collection?.Count ?? 0); i++)
         {
-            try
+            if (_collection.Get(i) != null)
             {
-                _collection?.Get(i)?.SetPictureSize(_pictureWidth, _pictureHeight);
-                _collection?.Get(i)?.SetPosition(_placeSizeWidth * curWidth, curHeight * _placeSizeHeight + 4);
+                _collection.Get(i).SetPictureSize(_pictureWidth, _pictureHeight);
+                _collection.Get(i).SetPosition(_placeSizeWidth * curWidth, curHeight * _placeSizeHeight + 4);
             }
-            catch (Exception) { }
             if (curWidth > 0)
                 curWidth--;
             else

ProjectSeaplane/ProjectSeaplane/CollectionGenericObjects/StorageCollection.cs

@@ -1,5 +1,4 @@
 using ProjectSeaplane.Drawings;
-using ProjectSeaplane.Exceptions;
 using System.Text;
 
 namespace ProjectSeaplane.CollectionGenericObjects;
@@ -79,11 +78,11 @@ public class StorageCollection<T>
     /// </summary>
     /// <param name="filename">Путь и имя файла</param>
     /// <returns>true - сохранение прошло успешно, false - ошибка при сохранении данных</returns>
-    public void SaveData(string filename)
+    public bool SaveData(string filename)
     {
         if (_storages.Count == 0)
         {
-            throw new Exception("В хранилище отсутствуют коллекции для сохранения");
+            return false;
         }
         if (File.Exists(filename))
         {
@@ -120,6 +119,8 @@ public class StorageCollection<T>
             }
 
         }
+
+        return true;
     }
 
     /// <summary>
@@ -127,22 +128,22 @@ public class StorageCollection<T>
     /// </summary>
     /// <param name="filename">Путь и имя файла</param>
     /// <returns>true - загрузка прошла успешно, false - ошибка при загрузке данных</returns>
-    public void LoadData(string filename)
+    public bool LoadData(string filename)
     {
         if (!File.Exists(filename))
         {
-            throw new Exception("Файл не существует");
+            return false;
         }
         using (StreamReader fs = File.OpenText(filename))
         {
             string str = fs.ReadLine();
             if (str == null || str.Length == 0)
             {
-                throw new Exception("В файле нет данных");
+                return false;
             }
             if (!str.StartsWith(_collectionKey))
             {
-                throw new Exception("В файле неверные данные");
+                return false;
             }
             _storages.Clear();
             string strs = "";
@@ -157,29 +158,23 @@ public class StorageCollection<T>
                 ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionType);
                 if (collection == null)
                 {
-                    throw new Exception("Не удалось создать коллекцию");
+                    return false;
                 }
                 collection.MaxCount = Convert.ToInt32(record[2]);
                 string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
                 foreach (string elem in set)
                 {
-                    if (elem?.CreateDrawningPlane() is T plane)
+                    if (elem?.CreateDrawningPlane() is T ship)
                     {
-                        try
+                        if (collection.Insert(ship) == -1)
                         {
-                            if (collection.Insert(plane) == -1)
-                            {
-                                throw new Exception("Объект не удалось добавить в коллекцию: " + record[3]);
-                            }
-                        }
-                        catch (CollectionOverflowException ex)
-                        {
-                            throw new Exception("Коллекция переполнена", ex);
+                            return false;
                         }
                     }
                 }
                 _storages.Add(record[0], collection);
             }
+            return true;
         }
     }
 

ProjectSeaplane/ProjectSeaplane/Drawings/DrawingPlane.cs

@@ -49,9 +49,9 @@ public class DrawingPlane
         _drawingPlaneHeight = drawingSeaplaneHeight;
     }
 
-    public DrawingPlane(EntityPlane plane) : this()
+    public DrawingPlane(EntityPlane ship) : this()
     {
-        EntityPlane = new EntityPlane(plane.Speed, plane.Weight, plane.BodyColor);
+        EntityPlane = new EntityPlane(ship.Speed, ship.Weight, ship.BodyColor);
     }
 
     public bool SetPictureSize(int width, int height)

ProjectSeaplane/ProjectSeaplane/Drawings/DrawingSeaplane.cs

@@ -14,9 +14,9 @@ public class DrawingSeaplane : DrawingPlane
         EntityPlane = new EntitySeaplane(speed, weight, bodyColor, additionalColor, floats, inflatableBoat);
     }
 
-    public DrawingSeaplane(EntitySeaplane plane) : base(190, 85)
+    public DrawingSeaplane(EntitySeaplane ship) : base(190, 85)
     {
-        EntityPlane = new EntitySeaplane(plane.Speed, plane.Weight, plane.BodyColor, plane.AdditionalColor, plane.Floats, plane.InflatableBoat);
+        EntityPlane = new EntitySeaplane(ship.Speed, ship.Weight, ship.BodyColor, ship.AdditionalColor, ship.Floats, ship.InflatableBoat);
     }
 
     public override void DrawTransport(Graphics g)

ProjectSeaplane/ProjectSeaplane/Exceptions/CollectionOverflowException.cs

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

ProjectSeaplane/ProjectSeaplane/Exceptions/ObjectNotFoundException.cs

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

ProjectSeaplane/ProjectSeaplane/Exceptions/PositionOutOfCollectionException.cs

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

ProjectSeaplane/ProjectSeaplane/FormSeaplaneCollection.Designer.cs

@@ -66,9 +66,9 @@
             groupBoxTools.Controls.Add(panelStorage);
             groupBoxTools.Controls.Add(comboBoxSelectorCompany);
             groupBoxTools.Dock = DockStyle.Right;
-            groupBoxTools.Location = new Point(677, 24);
+            groupBoxTools.Location = new Point(764, 24);
             groupBoxTools.Name = "groupBoxTools";
-            groupBoxTools.Size = new Size(200, 583);
+            groupBoxTools.Size = new Size(200, 603);
             groupBoxTools.TabIndex = 0;
             groupBoxTools.TabStop = false;
             groupBoxTools.Text = "Инструменты";
@@ -98,7 +98,7 @@
             // 
             // maskedTextBoxPosition
             // 
-            maskedTextBoxPosition.Location = new Point(3, 50);
+            maskedTextBoxPosition.Location = new Point(3, 97);
             maskedTextBoxPosition.Mask = "00";
             maskedTextBoxPosition.Name = "maskedTextBoxPosition";
             maskedTextBoxPosition.Size = new Size(182, 23);
@@ -107,7 +107,7 @@
             // 
             // buttonRefresh
             // 
-            buttonRefresh.Location = new Point(3, 197);
+            buttonRefresh.Location = new Point(3, 216);
             buttonRefresh.Name = "buttonRefresh";
             buttonRefresh.Size = new Size(182, 41);
             buttonRefresh.TabIndex = 6;
@@ -117,7 +117,7 @@
             // 
             // buttonDelPlane
             // 
-            buttonDelPlane.Location = new Point(3, 107);
+            buttonDelPlane.Location = new Point(3, 126);
             buttonDelPlane.Name = "buttonDelPlane";
             buttonDelPlane.Size = new Size(182, 41);
             buttonDelPlane.TabIndex = 4;
@@ -127,7 +127,7 @@
             // 
             // buttonGoToCheck
             // 
-            buttonGoToCheck.Location = new Point(3, 154);
+            buttonGoToCheck.Location = new Point(3, 173);
             buttonGoToCheck.Name = "buttonGoToCheck";
             buttonGoToCheck.Size = new Size(182, 41);
             buttonGoToCheck.TabIndex = 5;
@@ -244,7 +244,7 @@
             pictureBox.Dock = DockStyle.Fill;
             pictureBox.Location = new Point(0, 24);
             pictureBox.Name = "pictureBox";
-            pictureBox.Size = new Size(677, 583);
+            pictureBox.Size = new Size(764, 603);
             pictureBox.TabIndex = 1;
             pictureBox.TabStop = false;
             // 
@@ -253,7 +253,7 @@
             menuStrip.Items.AddRange(new ToolStripItem[] { файлToolStripMenuItem });
             menuStrip.Location = new Point(0, 0);
             menuStrip.Name = "menuStrip";
-            menuStrip.Size = new Size(877, 24);
+            menuStrip.Size = new Size(964, 24);
             menuStrip.TabIndex = 2;
             menuStrip.Text = "menuStrip1";
             // 
@@ -292,7 +292,7 @@
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(877, 607);
+            ClientSize = new Size(964, 627);
             Controls.Add(pictureBox);
             Controls.Add(groupBoxTools);
             Controls.Add(menuStrip);

ProjectSeaplane/ProjectSeaplane/FormSeaplaneCollection.cs

@@ -1,7 +1,5 @@
-using Microsoft.Extensions.Logging;
-using ProjectSeaplane.CollectionGenericObjects;
+using ProjectSeaplane.CollectionGenericObjects;
 using ProjectSeaplane.Drawings;
-using ProjectSeaplane.Exceptions;
 using System.Windows.Forms;
 
 namespace ProjectSeaplane;
@@ -12,14 +10,10 @@ public partial class FormSeaplaneCollection : Form
 
     private AbstractCompany? _company = null;
 
-    private readonly ILogger _logger;
-
-    public FormSeaplaneCollection(ILogger<FormSeaplaneCollection> logger)
+    public FormSeaplaneCollection()
     {
         InitializeComponent();
         _storageCollection = new();
-        _logger = logger;
-        _logger.LogInformation("Форма загрузилась");
     }
 
     private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
@@ -36,27 +30,67 @@ public partial class FormSeaplaneCollection : Form
 
     private void SetPlane(DrawingPlane? plane)
     {
-        try
+        if (_company == null || plane == null)
         {
-            if (_company == null || plane == null)
-            {
-                return;
-            }
-            if (_company + plane != -1)
-            {
-                MessageBox.Show("Объект добавлен");
-                pictureBox.Image = _company.Show();
-                _logger.LogInformation("Добавлен объект: " + plane.GetDataForSave());
-            }
+            return;
         }
-        catch (ObjectNotFoundException) { }
-        catch (CollectionOverflowException ex)
+        if (_company + plane != -1)
+        {
+            MessageBox.Show("Объект добавлен");
+            pictureBox.Image = _company.Show();
+        }
+        else
         {
             MessageBox.Show("Не удалось добавить объект");
-            _logger.LogError("Ошибка: {Message}", ex.Message);
         }
     }
 
+    private void CreateObject(string type)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+
+        Random random = new();
+        DrawingPlane drawningPlane;
+        switch (type)
+        {
+            case nameof(DrawingPlane):
+                drawningPlane = new DrawingPlane(random.Next(100, 300), random.Next(1000, 3000), GetColor(random));
+                break;
+            case nameof(DrawingSeaplane):
+                drawningPlane = new DrawingSeaplane(random.Next(100, 300), random.Next(1000, 3000),
+                    GetColor(random), GetColor(random),
+                    Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
+                break;
+            default:
+                return;
+        }
+
+        if (_company + drawningPlane != -1)
+        {
+            MessageBox.Show("Объект добавлен");
+            pictureBox.Image = _company.Show();
+        }
+        else
+        {
+            MessageBox.Show("Не удалось добавить объект");
+        }
+    }
+
+    private static Color GetColor(Random random)
+    {
+        Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
+        ColorDialog dialog = new();
+        if (dialog.ShowDialog() == DialogResult.OK)
+        {
+            color = dialog.Color;
+        }
+
+        return color;
+    }
+
     private void buttonDelPlane_Click(object sender, EventArgs e)
     {
         if (string.IsNullOrEmpty(maskedTextBoxPosition.Text) || _company == null)
@@ -70,19 +104,14 @@ public partial class FormSeaplaneCollection : Form
         }
 
         int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-        try
+        if (_company - pos != null)
         {
-            if (_company - pos != null)
-            {
-                MessageBox.Show("Объект удален");
-                pictureBox.Image = _company.Show();
-                _logger.LogInformation("Удален объект по позиции " + pos);
-            }
+            MessageBox.Show("Объект удален");
+            pictureBox.Image = _company.Show();
         }
-        catch (Exception ex)
+        else
         {
             MessageBox.Show("Не удалось удалить объект");
-            _logger.LogError("Ошибка: {Message}", ex.Message);
         }
     }
 
@@ -95,27 +124,26 @@ public partial class FormSeaplaneCollection : Form
 
         DrawingPlane? plane = null;
         int counter = 100;
-        try
+        while (plane == null)
         {
-            while (plane == null)
+            plane = _company.GetRandomObject();
+            counter--;
+            if (counter <= 0)
             {
-                plane = _company.GetRandomObject();
-                counter--;
-                if (counter <= 0)
-                {
-                    break;
-                }
+                break;
             }
-            FormSeaplane form = new()
-            {
-                SetPlane = plane
-            };
-            form.ShowDialog();
         }
-        catch (Exception ex)
+
+        if (plane == null)
         {
-            MessageBox.Show(ex.Message, "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            return;
         }
+
+        FormSeaplane form = new()
+        {
+            SetPlane = plane
+        };
+        form.ShowDialog();
     }
 
     private void buttonRefresh_Click(object sender, EventArgs e)
@@ -136,25 +164,18 @@ public partial class FormSeaplaneCollection : Form
             return;
         }
 
-        try
+        CollectionType collectionType = CollectionType.None;
+        if (radioButtonMassive.Checked)
         {
-            CollectionType collectionType = CollectionType.None;
-            if (radioButtonMassive.Checked)
-            {
-                collectionType = CollectionType.Massive;
-            }
-            else if (radioButtonList.Checked)
-            {
-                collectionType = CollectionType.List;
-            }
-            _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
-            RerfreshListBoxItems();
-            _logger.LogInformation("Коллекция добавлена " + textBoxCollectionName.Text);
+            collectionType = CollectionType.Massive;
         }
-        catch (Exception ex)
+        else if (radioButtonList.Checked)
         {
-            _logger.LogError("Ошибка: {Message}", ex.Message);
+            collectionType = CollectionType.List;
         }
+
+        _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
+        RerfreshListBoxItems();
     }
 
     private void buttonCollectionDel_Click(object sender, EventArgs e)
@@ -164,20 +185,12 @@ public partial class FormSeaplaneCollection : Form
             MessageBox.Show("Коллекция не выбрана");
             return;
         }
-        try
+        if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
         {
-            if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
-            {
-                return;
-            }
-            _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
-            RerfreshListBoxItems();
-            _logger.LogInformation("Коллекция: " + listBoxCollection.SelectedItem.ToString() + " удалена");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError("Ошибка: {Message}", ex.Message);
+            return;
         }
+        _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
+        RerfreshListBoxItems();
     }
 
     private void RerfreshListBoxItems()
@@ -191,6 +204,7 @@ public partial class FormSeaplaneCollection : Form
                 listBoxCollection.Items.Add(colName);
             }
         }
+
     }
 
     private void buttonCreateCompany_Click(object sender, EventArgs e)
@@ -223,16 +237,15 @@ public partial class FormSeaplaneCollection : Form
     {
         if (saveFileDialog.ShowDialog() == DialogResult.OK)
         {
-            try
+            if (_storageCollection.SaveData(saveFileDialog.FileName))
             {
-                _storageCollection.SaveData(saveFileDialog.FileName);
-                MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                _logger.LogInformation("Сохранение в файл: {filename}", saveFileDialog.FileName);
+                MessageBox.Show("Сохранение прошло успешно",
+                "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
             }
-            catch (Exception ex)
+            else
             {
-                MessageBox.Show(ex.Message, "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                _logger.LogError("Ошибка: {Message}", ex.Message);
+                MessageBox.Show("Не сохранилось", "Результат",
+                MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
         }
     }
@@ -241,17 +254,16 @@ public partial class FormSeaplaneCollection : Form
     {
         if (openFileDialog.ShowDialog() == DialogResult.OK)
         {
-            try
+            if (_storageCollection.LoadData(openFileDialog.FileName))
             {
-                _storageCollection.LoadData(openFileDialog.FileName);
-                MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                MessageBox.Show("Загрузка прошла успешно",
+                "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
                 RerfreshListBoxItems();
-                _logger.LogInformation("Загрузка из файла: {filename}", openFileDialog.FileName);
             }
-            catch (Exception ex)
+            else
             {
-                MessageBox.Show("Не сохранилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                _logger.LogError("Ошибка: {Message}", ex.Message);
+                MessageBox.Show("Не загрузилось", "Результат",
+                MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
         }
     }

ProjectSeaplane/ProjectSeaplane/FormSeaplaneCollection.resx

@@ -126,7 +126,4 @@
   <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>255, 17</value>
   </metadata>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>25</value>
-  </metadata>
 </root>

ProjectSeaplane/ProjectSeaplane/Program.cs

@@ -1,8 +1,3 @@
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Serilog;
-using Microsoft.Extensions.Configuration;
-
 namespace ProjectSeaplane
 {
     internal static class Program
@@ -16,31 +11,7 @@ namespace ProjectSeaplane
             // 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<FormSeaplaneCollection>());
-        }
-
-        private static void ConfigureServices(ServiceCollection services)
-        {
-            string[] path = Directory.GetCurrentDirectory().Split('\\');
-            string pathNeed = "";
-            for (int i = 0; i < path.Length - 3; i++)
-            {
-                pathNeed += path[i] + "\\";
-            }
-            services.AddSingleton<FormSeaplaneCollection>()
-            .AddLogging(option =>
-            {
-                option.SetMinimumLevel(LogLevel.Information);
-                option.AddSerilog(new LoggerConfiguration()
-                    .ReadFrom.Configuration(new ConfigurationBuilder()
-                        .AddJsonFile($"{pathNeed}serilog.json")
-                        .Build())
-                    .CreateLogger());
-            });
+            Application.Run(new FormSeaplaneCollection());
         }
     }
 }

ProjectSeaplane/ProjectSeaplane/ProjectSeaplane.csproj

@@ -8,17 +8,6 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
-    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.9" />
-    <PackageReference Include="Serilog" Version="3.1.1" />
-    <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>
-
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>

ProjectSeaplane/ProjectSeaplane/serilog.json

@@ -1,15 +0,0 @@
-{
-  "Serilog": {
-    "Using": [ "Serilog.Sinks.File" ],
-    "MinimumLevel": "Debug",
-    "WriteTo": [
-      {
-        "Name": "File",
-        "Args": { "path": "log.log" }
-      }
-    ],
-    "Properties": {
-      "Application": "Sample"
-    }
-  }
-}