RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/FormTractorCollection.cs

@@ -7,11 +7,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using Microsoft.Extensions.Logging;
 using ProjectTractor.DrawningObjects;
 using ProjectTractor.Generics;
 using ProjectTractor.MovementStrategy;
-using ProjectTractor.Exceptions;
 
 namespace ProjectTractor
 {
@@ -21,22 +19,15 @@ namespace ProjectTractor
         /// <summary>
         /// Набор объектов
         /// </summary>
-        /// 
         private readonly TractorsGenericStorage _storage;
-        /// <summary>
-        /// Логер
-        /// </summary>
-        private readonly ILogger _logger;
-
         /// <summary>
         /// Конструктор
         /// </summary>
-        public FormTractorCollection(ILogger<FormTractorCollection> logger)
+        public FormTractorCollection()
         {
             InitializeComponent();
             _storage = new TractorsGenericStorage(pictureBoxCollection.Width,
                 pictureBoxCollection.Height);
-            _logger = logger;
         }
         /// <summary>
         /// Заполнение listBoxObjects
@@ -76,7 +67,6 @@ namespace ProjectTractor
             }
             _storage.AddSet(textBoxStorageName.Text);
             ReloadObjects();
-            _logger.LogInformation($"Добавлен набор: { textBoxStorageName.Text}");
         }
         /// <summary>
         /// Выбор набора
@@ -100,14 +90,11 @@ namespace ProjectTractor
             {
                 return;
             }
-            string name = listBoxStorages.SelectedItem.ToString() ??
-            string.Empty;
-            if (MessageBox.Show($"Удалить объект {name}?", "Удаление",
-            MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+            if (MessageBox.Show($"Удалить объект {listBoxStorages.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
             {
-                _storage.DelSet(name);
+                _storage.DelSet(listBoxStorages.SelectedItem.ToString() ?? string.Empty);
+                listBoxStorages.SelectedItems.Clear();
                 ReloadObjects();
-                _logger.LogInformation($"Удален набор: {name}");
             }
         }
 
@@ -170,23 +157,15 @@ namespace ProjectTractor
                 return;
             }
             int pos = Convert.ToInt32(maskedTextBoxNumber.Text);
-            try
+            if (obj - pos != null)
             {
-                if (obj - pos != null)
-                {
-                    MessageBox.Show("Объект удален");
-                    pictureBoxCollection.Image = obj.ShowTractors();
-                }
-                else
-                {
-                    MessageBox.Show("Не удалось удалить объект");
-                }
+                MessageBox.Show("Объект удален");
+                pictureBoxCollection.Image = obj.ShowTractors();
             }
-            catch (TractorNotFoundException ex)
+            else
             {
-                MessageBox.Show(ex.Message);
+                MessageBox.Show("Не удалось удалить объект");
             }
-
         }
         /// <summary>
         /// Обновление рисунка по набору
@@ -216,18 +195,16 @@ namespace ProjectTractor
         {
             if (saveFileDialog.ShowDialog() == DialogResult.OK)
             {
-                try
+                if (_storage.SaveData(saveFileDialog.FileName))
                 {
-                    _storage.SaveData(saveFileDialog.FileName);
                     MessageBox.Show("Сохранение прошло успешно",
                     "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
                 }
-                catch (Exception ex)
+                else
                 {
-                    MessageBox.Show($"Не сохранилось: {ex.Message}",
-                    "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    MessageBox.Show("Не сохранилось", "Результат",
+                    MessageBoxButtons.OK, MessageBoxIcon.Error);
                 }
-
             }
         }
         /// <summary>
@@ -239,22 +216,19 @@ namespace ProjectTractor
         {
             if (openFileDialog.ShowDialog() == DialogResult.OK)
             {
-                try
+                if (_storage.LoadData(openFileDialog.FileName))
                 {
-                    _storage.LoadData(openFileDialog.FileName);
                     MessageBox.Show("Загрузка прошла успешно",
                     "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                    _logger.LogInformation("Загрузка прошла успешно:");
                     foreach (var collection in _storage.Keys)
                     {
                         listBoxStorages.Items.Add(collection);
                     }
-                    ReloadObjects();
                 }
-                catch (Exception ex)
+                else
                 {
-                    _logger.LogWarning("Не удалось загрузить");
-                    MessageBox.Show($"Не загрузилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    MessageBox.Show("Не удалось загрузить", "Результат",
+                    MessageBoxButtons.OK, MessageBoxIcon.Error);
                 }
             }
         }

RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Program.cs

@@ -1,13 +1,9 @@
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using NLog.Extensions.Logging;
-
 namespace ProjectTractor
 {
     internal static class Program
     {
         /// <summary>
-        /// The main entry point for the application.
+        ///  The main entry point for the application.
         /// </summary>
         [STAThread]
         static void Main()
@@ -15,23 +11,7 @@ namespace ProjectTractor
             // 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())
-            {
-
-                Application.Run(serviceProvider.GetRequiredService<FormTractorCollection>());
-            }
-        }
-        private static void ConfigureServices(ServiceCollection services)
-        {
-            services.AddSingleton<FormTractorCollection>()
-            .AddLogging(option =>
-            {
-                option.SetMinimumLevel(LogLevel.Information);
-                option.AddNLog("nlog.config");
-            });
+            Application.Run(new FormTractorCollection());
         }
     }
 }

RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/ProjectTractor.csproj

@@ -8,11 +8,6 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.7" />
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>

RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Properties/Resources.resx

@@ -59,7 +59,6 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-  
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">

RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/StorageOverflowException.cs

@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Runtime.Serialization;
-
-namespace ProjectTractor.Exceptions
-{
-    [Serializable]
-    internal class StorageOverflowException : ApplicationException
-    {
-        public StorageOverflowException(int count) : base($"В наборе превышено допустимое количество: { count}") { }
-        public StorageOverflowException() : base() { }
-        public StorageOverflowException(string message) : base(message) { }
-        public StorageOverflowException(string message, Exception exception)
-        : base(message, exception) { }
-        protected StorageOverflowException(SerializationInfo info,
-        StreamingContext contex) : base(info, contex) { }
-    }
-
-}

RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/TractorNotFoundException.cs

@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Runtime.Serialization;
-
-namespace ProjectTractor.Exceptions
-{
-    [Serializable]
-    internal class TractorNotFoundException : ApplicationException
-    {
-        public TractorNotFoundException(int i) : base($"Не найден объект по позиции { i}") { }
-        public TractorNotFoundException() : base() { }
-        public TractorNotFoundException(string message) : base(message) { }
-        public TractorNotFoundException(string message, Exception exception) :
-        base(message, exception)
-        { }
-        protected TractorNotFoundException(SerializationInfo info,
-        StreamingContext contex) : base(info, contex) { }
-    }
-
-}

RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/TractorsGenericStorage.cs

@@ -114,7 +114,7 @@ namespace ProjectTractor
             }
             if (data.Length == 0)
             {
-                throw new Exception("Невалиданя операция, нет данных для сохранения");
+                return false;
             }
             using (StreamWriter streamWriter = new(filename))
             {
@@ -131,7 +131,7 @@ namespace ProjectTractor
         {
             if (!File.Exists(filename))
             {
-                throw new Exception("Файл не найден");
+                return false;
             }
             using (StreamReader streamReader = new(filename))
             {
@@ -139,12 +139,11 @@ namespace ProjectTractor
                 string[] strings = str.Split(new char[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries);
                 if (strings == null || strings.Length == 0)
                 {
-                    throw new Exception("Нет данных для загрузки");
+                    return false;
                 }
                 if (!strings[0].StartsWith("TractorStorage"))
                 {
-                    //если нет такой записи, то это не те данные
-                    throw new Exception("Неверный формат данных");
+                    return false;
                 }
                 _tractorStorages.Clear();
                 do
@@ -159,12 +158,12 @@ namespace ProjectTractor
                     string[] set = record[1].Split(_separatorRecords, StringSplitOptions.RemoveEmptyEntries);
                     foreach (string elem in set)
                     {
-                        DrawningTractor? tractor = elem?.CreateDrawningTractor(_separatorForObject, _pictureWidth, _pictureHeight);
-                        if (tractor != null)
+                        DrawningTractor? bus = elem?.CreateDrawningTractor(_separatorForObject, _pictureWidth, _pictureHeight);
+                        if (bus != null)
                         {
-                            if (!(collection + tractor))
+                            if (!(collection + bus))
                             {
-                                throw new Exception("Ошибка добавления в коллекцию");
+                                return false;
                             }
                         }
                     }

RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/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="carlog-
-${shortdate}.log" />
-    </targets>
-    <rules>
-      <logger name="*" minlevel="Debug" writeTo="tofile" />
-    </rules>
-  </nlog>
-</configuration>