очистка от ненужных файлов

ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/AbstractCompany.cs

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

ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/ListGenericObjects.cs

@@ -1,5 +1,4 @@
-using ProjectGasolineTanker.Exceptions;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -22,6 +21,16 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
 
     public int Count => _collection.Count;
 
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public ListGenericObjects()
+    {
+        _collection = new();
+    }
+
+    public CollectionType GetCollectionType => CollectionType.List;
+
     public int MaxCount
     {
         get
@@ -38,20 +47,10 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
         }
     }
 
-    public CollectionType GetCollectionType => CollectionType.List;
-
-    /// <summary>
-    /// Конструктор
-    /// </summary>
-    public ListGenericObjects()
-    {
-        _collection = new();
-    }
-
     public T? Get(int position)
     {
         if (position >= Count || position < 0)
-            throw new PositionOutOfCollectionException(position);
+            return null;
 
         return _collection[position];
     }
@@ -59,8 +58,7 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
     public int Insert(T obj)
     {
         if (Count + 1 > _maxCount)
-            throw new CollectionOverflowException(Count);
-
+            return -1;
         _collection.Add(obj);
         return Count;
     }
@@ -68,11 +66,9 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
     public int Insert(T obj, int position)
     {
         if (Count + 1 > _maxCount)
-            throw new CollectionOverflowException(Count);
-
+            return -1;
         if (position < 0 || position > Count)
-            throw new PositionOutOfCollectionException(position);
-
+            return -1;
         _collection.Insert(position, obj);
         return 1;
     }
@@ -80,7 +76,7 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
     public T? Remove(int position)
     {
         if (position < 0 || position > Count)
-            throw new PositionOutOfCollectionException(position);
+            return null;
 
         T? temp = _collection[position];
         _collection.RemoveAt(position);

ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -1,5 +1,4 @@
-using ProjectGasolineTanker.Exceptions;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -53,16 +52,12 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
     public T? Get(int position)
     {
         if (position < 0 || position >= Count)
-            throw new PositionOutOfCollectionException(position);
-
-        if (position >= _collection.Length && _collection[position] == null)
-            throw new ObjectNotFoundException(position);
-
+            return null;
         return _collection[position];
     }
 
     public int Insert(T obj)
-    {   
+    {
         for (int i = 0; i < Count; i++)
         {
             if (_collection[i] == null)
@@ -71,13 +66,13 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
                 return i;
             }
         }
-        throw new CollectionOverflowException(Count);
+        return -1;
     }
 
     public int Insert(T obj, int position)
     {
         if (position < 0 || position >= Count)
-            throw new PositionOutOfCollectionException(position);
+            return -1;
 
         if (_collection[position] == null)
         {
@@ -106,16 +101,19 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
             }
             temp--;
         }
-        throw new CollectionOverflowException(Count);
+
+        return -1;
     }
 
     public T? Remove(int position)
     {
         if (position < 0 || position >= Count)
-            throw new PositionOutOfCollectionException(position);
+            return null;
 
         if (_collection[position] == null)
-            throw new ObjectNotFoundException(position);
+        {
+            return null;
+        }
 
         T? temp = _collection[position];
         _collection[position] = null;
@@ -130,4 +128,3 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
         }
     }
 }
-

ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/StorageCollection.cs

@@ -1,5 +1,4 @@
 using ProjectGasolineTanker.Drawings;
-using ProjectGasolineTanker.Exceptions;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -93,10 +92,10 @@ public class StorageCollection<T>
         }
     }
 
-    public void SaveData(string filename)
+    public bool SaveData(string filename)
     {
         if (_storages.Count == 0)
-            throw new InvalidDataException("В хранилище отсутсвуют коллекции для сохранения");
+            return false;
 
         if (File.Exists(filename))
             File.Delete(filename);
@@ -131,13 +130,14 @@ public class StorageCollection<T>
                 sw.Write(_separatorItems);
             }
         }
+        return true;
     }
 
-    public void LoadData(string filename)
+    public bool LoadData(string filename)
     {
         if (!File.Exists(filename))
         {
-            throw new FileNotFoundException("Файл не существует");
+            return false;
         }
 
         using (FileStream fs = new(filename, FileMode.Open))
@@ -147,12 +147,12 @@ public class StorageCollection<T>
             string str = sr.ReadLine();
             if (str == null || str.Length == 0)
             {
-                throw new InvalidDataException("В файле нет данных");
+                return false;
             }
 
             if (!str.Equals(_collectionKey))
             {
-                throw new InvalidOperationException("В файле неверные данные");
+                return false;
             }
             _storages.Clear();
 
@@ -168,7 +168,7 @@ public class StorageCollection<T>
                 ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionType);
                 if (collection == null)
                 {
-                    throw new InvalidOperationException("Не удалось создать коллекцию");
+                    return false;
                 }
 
                 collection.MaxCount = Convert.ToInt32(record[2]);
@@ -176,24 +176,16 @@ public class StorageCollection<T>
                 string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
                 foreach (string elem in set)
                 {
-                    if (elem?.CreateDrawingTanker() is T tanker)
+                    if (elem?.CreateDrawingTanker() is T airplane)
                     {
-                        try
-                        {
-                            if (collection.Insert(tanker) == -1)
-                            {
-                                throw new InvalidOperationException("Объект не удалось добавить в коллекцию: " + record[3]);
-                            }
-                        }
-                        catch (CollectionOverflowException ex)
-                        {
-                            throw new ArgumentOutOfRangeException("Коллекция переполнена", ex);
-                        }
+                        if (collection.Insert(airplane) == -1)
+                            return false;
                     }
                 }
                 _storages.Add(record[0], collection);
             }
         }
+        return true;
     }
 
     private static ICollectionGenericObjects<T>? CreateCollection(CollectionType collectionType)

ProjectGasolineTanker/ProjectGasolineTanker/Exceptions/CollectionOverflowException.cs

@@ -1,17 +0,0 @@
-using System.Runtime.Serialization;
-
-namespace ProjectGasolineTanker.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) { }
-}

ProjectGasolineTanker/ProjectGasolineTanker/Exceptions/ObjectNotFoundException.cs

@@ -1,17 +0,0 @@
-using System.Runtime.Serialization;
-
-namespace ProjectGasolineTanker.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) { }
-}

ProjectGasolineTanker/ProjectGasolineTanker/Exceptions/PositionOutOfCollectionException.cs

@@ -1,17 +0,0 @@
-using System.Runtime.Serialization;
-
-namespace ProjectGasolineTanker.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) { }
-}

ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.cs

@@ -9,8 +9,6 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using ProjectGasolineTanker.Drawings;
-using Microsoft.Extensions.Logging;
-using ProjectGasolineTanker.Exceptions;
 
 namespace ProjectGasolineTanker;
 
@@ -22,17 +20,13 @@ public partial class FormTankerCollection : Form
     /// </summary>
     private AbstractCompany? _company = null;
 
-    private readonly ILogger _logger;
-
     /// <summary>
     /// Конструктор
     /// </summary>
-    public FormTankerCollection(ILogger<FormTankerCollection> logger)
+    public FormTankerCollection()
     {
         InitializeComponent();
         _storageCollection = new();
-        _logger = logger;
-        _logger.LogInformation("Форма загрузилась");
     }
 
     /// <summary>
@@ -55,26 +49,18 @@ public partial class FormTankerCollection : Form
     private void SetTanker(DrawingTanker tanker)
     {
         if (_company == null || tanker == null)
+        {
             return;
+        }
 
-        try
+        if (_company + tanker != -1)
         {
-            if (_company + tanker != -1)
-            {
-                MessageBox.Show("Объект добавлен");
-                pictureBox.Image = _company.Show();
-                _logger.LogInformation("Добавлен объект: " + tanker.GetDataForSave());
-            }
+            MessageBox.Show("Объект добавлен");
+            pictureBox.Image = _company.Show();
         }
-        catch (CollectionOverflowException ex)
+        else
         {
-            MessageBox.Show(ex.Message);
-            _logger.LogError("Ошибка: {Message}", ex.Message);
-        }
-        catch (ObjectNotFoundException ex)
-        {
-            MessageBox.Show(ex.Message);
-            _logger.LogError("Ошибка: {Message}", ex.Message);
+            MessageBox.Show("Не удалось добавить объект");
         }
     }
 
@@ -96,25 +82,14 @@ public partial class FormTankerCollection : Form
         }
 
         int pos = Convert.ToInt32(maskedTextBox1.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 (PositionOutOfCollectionException ex)
+        else
         {
-            MessageBox.Show(ex.Message);
-            _logger.LogError("Ошибка: {Message}", ex.Message);
-        }
-        catch (ObjectNotFoundException ex)
-        {
-            MessageBox.Show(ex.Message);
-            _logger.LogError("Ошибка: {Message}", ex.Message);
+            MessageBox.Show("Не удалось удалить объект");
         }
     }
 
@@ -134,22 +109,11 @@ public partial class FormTankerCollection : Form
         int counter = 100;
         while (tanker == null)
         {
-            try
+            tanker = _company.GetRandomObject();
+            counter--;
+            if (counter <= 0)
             {
-                tanker = _company.GetRandomObject();
-                counter--;
-                if (counter <= 0)
-                {
-                    break;
-                }
-            }
-            catch (PositionOutOfCollectionException ex)
-            {
-                MessageBox.Show(ex.Message);
-            }
-            catch (ObjectNotFoundException ex)
-            {
-                MessageBox.Show(ex.Message);
+                break;
             }
         }
 
@@ -188,34 +152,14 @@ public partial class FormTankerCollection : Form
             return;
         }
 
-        //CollectionType collectionType = CollectionType.None;
-        //if (radioButtonMassive.Checked)
-        //    collectionType = CollectionType.Massive;
-        //else if (radioButtonList.Checked)
-        //    collectionType = CollectionType.List;
+        CollectionType collectionType = CollectionType.None;
+        if (radioButtonMassive.Checked)
+            collectionType = CollectionType.Massive;
+        else if (radioButtonList.Checked)
+            collectionType = CollectionType.List;
 
-        //_storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
-        //RefreshListBoxItems();
-
-        try
-        {
-            CollectionType collectionType = CollectionType.None;
-            if (radioButtonMassive.Checked)
-            {
-                collectionType = CollectionType.Massive;
-            }
-            else if (radioButtonList.Checked)
-            {
-                collectionType = CollectionType.List;
-            }
-            _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
-            RefreshListBoxItems();
-            _logger.LogInformation("Коллекция добавлена " + textBoxCollectionName.Text);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError("Ошибка: {Message}", ex.Message);
-        }
+        _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
+        RefreshListBoxItems();
     }
 
     private void RefreshListBoxItems()
@@ -225,7 +169,9 @@ public partial class FormTankerCollection : Form
         {
             string? colName = _storageCollection.Keys?[i];
             if (!string.IsNullOrEmpty(colName))
+            {
                 listBoxCollection.Items.Add(colName);
+            }
         }
     }
 
@@ -275,16 +221,13 @@ public partial class FormTankerCollection : 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);
             }
-            catch (Exception ex)
+            else
             {
-                MessageBox.Show(ex.Message, "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                _logger.LogError("Ошибка: {Message}", ex.Message);
+                MessageBox.Show("Не сохранилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
         }
     }
@@ -293,17 +236,14 @@ public partial class FormTankerCollection : Form
     {
         if (openFileDialog.ShowDialog() == DialogResult.OK)
         {
-            try
+            if (_storageCollection.LoadData(openFileDialog.FileName))
             {
-                _storageCollection.LoadData(openFileDialog.FileName);
                 MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
                 RefreshListBoxItems();
-                _logger.LogInformation("Загрузка из файла: {filename}", openFileDialog.FileName);
             }
-            catch (Exception ex)
+            else
             {
-                MessageBox.Show(ex.Message, "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                _logger.LogError("Ошибка: {Message}", ex.Message);
+                MessageBox.Show("Не сохранилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
         }
     }

ProjectGasolineTanker/ProjectGasolineTanker/Program.cs

@@ -1,8 +1,3 @@
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Serilog;
-
 namespace ProjectGasolineTanker
 {
     internal static class Program
@@ -16,27 +11,7 @@ namespace ProjectGasolineTanker
             // 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<FormTankerCollection>());
-        }
-
-        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<FormTankerCollection>()
-            .AddLogging(option =>
-            {
-                option.SetMinimumLevel(LogLevel.Information);
-                option.AddSerilog(new LoggerConfiguration()
-                    .ReadFrom.Configuration(new ConfigurationBuilder().AddJsonFile($"{pathNeed}serilog.json").Build()).CreateLogger());
-            });
+            Application.Run(new FormTankerCollection());
         }
     }
 }

ProjectGasolineTanker/ProjectGasolineTanker/ProjectGasolineTanker.csproj

@@ -8,20 +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" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
-    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.10" />
-    <PackageReference Include="Serilog" Version="3.1.1" />
-    <PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
-    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
@@ -37,10 +23,4 @@
     </EmbeddedResource>
   </ItemGroup>
 
-  <ItemGroup>
-    <None Update="serilog.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
 </Project>

ProjectGasolineTanker/ProjectGasolineTanker/serilog.json

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