From 53b04bf136ffa827dc5a63eb24252034a298c4bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D1=91=D0=BD=D0=B0=20=D0=A4=D1=80=D0=BE=D0=BB?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0?= <frolovalyona_2005@outlook.com>
Date: Thu, 16 May 2024 09:12:06 +0400
Subject: [PATCH] =?UTF-8?q?7=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?=
 =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectCatamaran/FormBoatCollection.cs    | 43 +++++++++----------
 .../ProjectCatamaran/ProjectCatamaran.csproj  |  7 ++-
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/ProjectCatamaran/ProjectCatamaran/FormBoatCollection.cs b/ProjectCatamaran/ProjectCatamaran/FormBoatCollection.cs
index 7da5162..e4da5eb 100644
--- a/ProjectCatamaran/ProjectCatamaran/FormBoatCollection.cs
+++ b/ProjectCatamaran/ProjectCatamaran/FormBoatCollection.cs
@@ -70,24 +70,22 @@ public partial class FormBoatCollection : Form
     /// <param name="boat"></param>
     private void SetBoat(DrawningBoat boat)
     {
-        try
+      if (_company == null || boat == null)
+      {
+          return;
+      }
+            try
         {
-            if (_company == null || boat == null)
-            {
-                return;
-            }
-            if (_company + boat != -1)
-            {
-                MessageBox.Show("Объект добавлен");
-                pictureBoxBoat.Image = _company.Show();
-                _logger.LogInformation("Добавлен объект: " + boat.GetDataForSave());
-            }
+            var res = _company + boat;
+            MessageBox.Show("Объект добавлен");
+            _logger.LogInformation($"Объект добавлен под индексом {res}");
+            pictureBoxBoat.Image = _company.Show();
         }
-        catch (ObjectNotFoundException) { }
-        catch (CollectionOverflowException ex)
+        catch (Exception ex)
         {
-            MessageBox.Show("Не удалось добавить объект");
-            _logger.LogError("Ошибка: {Message}", ex.Message);
+            MessageBox.Show($"Объект не добавлен: {ex.Message}", "Результат", MessageBoxButtons.OK,
+                MessageBoxIcon.Error);
+            _logger.LogError($"Ошибка: {ex.Message}", ex.Message);
         }
     }
 
@@ -113,17 +111,16 @@ public partial class FormBoatCollection : Form
         int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
         try
         {
-            if (_company - pos != null)
-            {
-                MessageBox.Show("Объект удален");
-                pictureBoxBoat.Image = _company.Show();
-                _logger.LogInformation("Удален объект по позиции " + pos);
-            }
+            var res = _company - pos;
+            MessageBox.Show("Объект удален");
+            _logger.LogInformation($"Объект удален под индексом {pos}");
+            pictureBoxBoat.Image = _company.Show();
         }
         catch (Exception ex)
         {
-            MessageBox.Show("Не удалось удалить объект");
-            _logger.LogError("Ошибка: {Message}", ex.Message);
+            MessageBox.Show(ex.Message, "Не удалось удалить объект",
+                MessageBoxButtons.OK, MessageBoxIcon.Error);
+            _logger.LogError($"Ошибка: {ex.Message}", ex.Message);
         }
     }
 
diff --git a/ProjectCatamaran/ProjectCatamaran/ProjectCatamaran.csproj b/ProjectCatamaran/ProjectCatamaran/ProjectCatamaran.csproj
index 277d423..8397199 100644
--- a/ProjectCatamaran/ProjectCatamaran/ProjectCatamaran.csproj
+++ b/ProjectCatamaran/ProjectCatamaran/ProjectCatamaran.csproj
@@ -10,10 +10,13 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+    <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" Version="7.0.0" />
     <PackageReference Include="NLog.Extensions.Logging" Version="5.3.11" />
     <PackageReference Include="Serilog" Version="3.1.1" />
+    <PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>