изменения

2023-11-29 19:49:43 +04:00
12 changed files with 67 additions and 485 deletions
--- a/AirBomber/AirBomber.csproj
+++ b/AirBomber/AirBomber.csproj
@@ -8,18 +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="NLog.Extensions.Logging" Version="5.3.5" />
-    <PackageReference Include="Serilog" Version="3.1.1" />
-    <PackageReference Include="Serilog.Extensions.Hosting" 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>
--- a/AirBomber/BomberGenericCollection.cs
+++ b/AirBomber/BomberGenericCollection.cs
@@ -14,11 +14,6 @@ namespace AirBomber.Generics
        where T : DrawningBomber
        where U : IMoveableObject
    {
-        /// <summary>
-        /// Получение объектов коллекции
-        /// </summary>
-        public IEnumerable<T?> GetPlane => _collection.GetPlane();
-
        private readonly int _pictureWidth;
        private readonly int _pictureHeight;
        private readonly int _placeSizeWidth = 155;
@@ -43,14 +38,15 @@ namespace AirBomber.Generics
            return collect._collection.Insert(obj);
        }

-        public static T? operator -(BomberGenericCollection<T, U> collect, int pos)
+        public static bool operator -(BomberGenericCollection<T, U> collect, int
+        pos)
        {
            T? obj = collect._collection[pos];
-            if (obj != null)
+            if (obj == null)
            {
-                collect._collection.Remove(pos);
+                return false;
            }
-            return obj;
+            return collect._collection.Remove(pos);
        }

        public U? GetU(int pos)
@@ -103,5 +99,6 @@ namespace AirBomber.Generics
                }
            }
        }
+
    }
 }
--- a/AirBomber/BomberGenericStorage.cs
+++ b/AirBomber/BomberGenericStorage.cs
@@ -4,7 +4,6 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using AirBomber.DrawningObjects;
-using AirBomber.Exceptions;
 using AirBomber.MovementStrategy;

 namespace AirBomber.Generics
@@ -26,18 +25,6 @@ namespace AirBomber.Generics
        /// </summary>
        private readonly int _pictureHeight;
        /// <summary>
-        /// Разделитель для записи ключа и значения элемента словаря
-        /// </summary>
-        private static readonly char _separatorForKeyValue = '|';
-        /// <summary>
-        /// Разделитель для записей коллекции данных в файл
-        /// </summary>
-        private readonly char _separatorRecords = ';';
-        /// <summary>
-        /// Разделитель для записи информации по объекту в файл
-        /// </summary>
-        private static readonly char _separatorForObject = ':';
-        /// <summary>
        /// Конструктор
        /// </summary>
        /// <param name="pictureWidth"></param>
@@ -78,93 +65,5 @@ namespace AirBomber.Generics
                return null;
            }
        }
-        public void SaveData(string filename)
-        {
-            if (File.Exists(filename))
-            {
-                File.Delete(filename);
-            }
-            StringBuilder data = new();
-            foreach (KeyValuePair<string, BomberGenericCollection<DrawningBomber, DrawningObjectBomber>> record in _bomberStorage)
-            {
-                StringBuilder records = new();
-                foreach (DrawningBomber? elem in record.Value.GetPlane)
-                {
-                    records.Append($"{elem?.GetDataForSave(_separatorForObject)}{_separatorRecords}");
-                }
-                data.AppendLine($"{record.Key}{_separatorForKeyValue}{records}");
-            }
-            if (data.Length == 0)
-            {
-                throw new InvalidOperationException("Невалидная операция, нет данных для сохранения");
-            }
-
-            using (StreamWriter writer = new StreamWriter(filename))
-            {
-                writer.Write($"BomberStorage{Environment.NewLine}{data}");
-            }
-        }
-
-        /// <summary>
-        /// Загрузка информации по установкам в хранилище из файла
-        /// </summary>
-        /// <param name="filename">Путь и имя файла</param>
-        /// <returns>true - загрузка прошла успешно, false - ошибка при загрузке данных</returns>
-        public void LoadData(string filename)
-        {
-            if (!File.Exists(filename))
-            {
-                throw new FileNotFoundException("Файл не найден");
-            }
-
-            using (StreamReader reader = new StreamReader(filename))
-            {
-                string cheker = reader.ReadLine();
-                if (cheker == null)
-                {
-                    throw new Exception("Нет данных для загрузки");
-                }
-                if (!cheker.StartsWith("BomberStorage"))
-                {
-                    throw new FormatException("Неверный формат ввода");
-                }
-                _bomberStorage.Clear();
-                string strs;
-                bool firstinit = true;
-                while ((strs = reader.ReadLine()) != null)
-                {
-                    if (strs == null && firstinit)
-                    {
-                        throw new Exception("Нет данных для загрузки");
-                    }
-                    if (strs == null)
-                    {
-                        break;
-                    }
-                    firstinit = false;
-                    string name = strs.Split(_separatorForKeyValue)[0];
-                    BomberGenericCollection<DrawningBomber, DrawningObjectBomber> collection = new(_pictureWidth, _pictureHeight);
-                    foreach (string data in strs.Split(_separatorForKeyValue)[1].Split(_separatorRecords))
-                    {
-                        DrawningBomber? air =
-                        data?.CreateDrawningBomber(_separatorForObject, _pictureWidth, _pictureHeight);
-                        if (air != null)
-                        {
-                            try { _ = collection + air; }
-                            catch (BomberNotFoundException e)
-                            {
-                                throw e;
-                            }
-                            catch (StorageOverflowException e)
-                            {
-                                throw e;
-                            }
-                        }
-
-                    }
-                    _bomberStorage.Add(name, collection);
-                }
-            }
-        }
    }
 }
--- a/AirBomber/BomberNotFoundException.cs
+++ b/AirBomber/BomberNotFoundException.cs
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Serialization;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AirBomber.Exceptions
-{
-    [Serializable]
-    internal class BomberNotFoundException : ApplicationException
-    {
-        public BomberNotFoundException(int i) : base($"Не найден объект по позиции {i}") { }
-        public BomberNotFoundException() : base() { }
-        public BomberNotFoundException(string message) : base(message) { }
-        public BomberNotFoundException(string message, Exception exception) : base(message, exception) { }
-        protected BomberNotFoundException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
-    }
-}
--- a/AirBomber/ExtentionDrawningBomber.cs
+++ b/AirBomber/ExtentionDrawningBomber.cs
@@ -1,62 +0,0 @@
-using AirBomber.Entities;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AirBomber.DrawningObjects
-{
-    public static class ExtentionDrawningBomber
-    {
-        /// <summary>
-        /// Создание объекта из строки
-        /// </summary>
-        /// <param name="info">Строка с данными для создания объекта</param>
-        /// <param name="separatorForObject">Разделитель даннных</param>
-        /// <param name="width">Ширина</param>
-        /// <param name="height">Высота</param>
-        /// <returns>Объект</returns>
-        public static DrawningBomber? CreateDrawningBomber(this string info, char separatorForObject, int width, int height)
-        {
-            string[] strs = info.Split(separatorForObject);
-            if (strs.Length == 3)
-            {
-                return new DrawningBomber(Convert.ToInt32(strs[0]),
-                Convert.ToInt32(strs[1]), Color.FromName(strs[2]), width, height);
-            }
-            else if (strs.Length == 6)
-            {
-                return new DrawningAirBomber(Convert.ToInt32(strs[0]),
-                Convert.ToInt32(strs[1]),
-                Color.FromName(strs[2]),
-                Color.FromName(strs[3]),
-                Convert.ToBoolean(strs[4]),
-                Convert.ToBoolean(strs[5]), width, height);
-            }
-            return null;
-        }
-        /// <summary>
-        /// Получение данных для сохранения в файл
-        /// </summary>
-        /// <param name="drawningBomber">Сохраняемый объект</param>
-        /// <param name="separatorForObject">Разделитель даннных</param>
-        /// <returns>Строка с данными по объекту</returns>
-        public static string GetDataForSave(this DrawningBomber drawningBomber,
-        char separatorForAir)
-        {
-            var air = drawningBomber.EntityBomber;
-            if (air == null)
-            {
-                return string.Empty;
-            }
-            var str =
-            $"{air.Speed}{separatorForAir}{air.Weight}{separatorForAir}{air.BodyColor.Name}";
-            if (air is not EntityAirBomber airBomber)
-            {
-                return str;
-            }
-            return $"{str}{separatorForAir}{airBomber.DopColor.Name}{separatorForAir}{airBomber.Toplivo}{separatorForAir}{airBomber.Rocket}";
-        }
-    }
-}
--- a/AirBomber/FormBomberCollection.Designer.cs
+++ b/AirBomber/FormBomberCollection.Designer.cs
@@ -39,16 +39,9 @@
            ButtonAddBomber = new Button();
            MessageBoxBomber = new TextBox();
            PicBoxBomberCollection = new PictureBox();
-            menuStrip = new MenuStrip();
-            fileToolStripMenuItem = new ToolStripMenuItem();
-            SaveToolStripMenuItem = new ToolStripMenuItem();
-            LoadToolStripMenuItem = new ToolStripMenuItem();
-            openFileDialog = new OpenFileDialog();
-            saveFileDialog = new OpenFileDialog();
            Tools.SuspendLayout();
            Kit.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)PicBoxBomberCollection).BeginInit();
-            menuStrip.SuspendLayout();
            SuspendLayout();
            // 
            // Tools
@@ -58,11 +51,9 @@
            Tools.Controls.Add(ButtonRemoveBomber);
            Tools.Controls.Add(ButtonAddBomber);
            Tools.Controls.Add(MessageBoxBomber);
-            Tools.Location = new Point(471, 4);
-            Tools.Margin = new Padding(3, 2, 3, 2);
+            Tools.Location = new Point(538, 5);
            Tools.Name = "Tools";
-            Tools.Padding = new Padding(3, 2, 3, 2);
-            Tools.Size = new Size(219, 417);
+            Tools.Size = new Size(250, 556);
            Tools.TabIndex = 0;
            Tools.TabStop = false;
            Tools.Text = "Инструменты";
@@ -73,21 +64,18 @@
            Kit.Controls.Add(AddKit);
            Kit.Controls.Add(KitTextbox);
            Kit.Controls.Add(listBoxStorages);
-            Kit.Location = new Point(15, 25);
-            Kit.Margin = new Padding(3, 2, 3, 2);
+            Kit.Location = new Point(17, 33);
            Kit.Name = "Kit";
-            Kit.Padding = new Padding(3, 2, 3, 2);
-            Kit.Size = new Size(199, 212);
+            Kit.Size = new Size(227, 282);
            Kit.TabIndex = 4;
            Kit.TabStop = false;
            Kit.Text = "Наборы";
            // 
            // RemoveKit
            // 
-            RemoveKit.Location = new Point(10, 173);
-            RemoveKit.Margin = new Padding(3, 2, 3, 2);
+            RemoveKit.Location = new Point(11, 231);
            RemoveKit.Name = "RemoveKit";
-            RemoveKit.Size = new Size(169, 27);
+            RemoveKit.Size = new Size(193, 36);
            RemoveKit.TabIndex = 3;
            RemoveKit.Text = "Удалить набор";
            RemoveKit.UseVisualStyleBackColor = true;
@@ -95,10 +83,9 @@
            // 
            // AddKit
            // 
-            AddKit.Location = new Point(10, 47);
-            AddKit.Margin = new Padding(3, 2, 3, 2);
+            AddKit.Location = new Point(11, 63);
            AddKit.Name = "AddKit";
-            AddKit.Size = new Size(169, 27);
+            AddKit.Size = new Size(193, 36);
            AddKit.TabIndex = 2;
            AddKit.Text = "Добавить набор";
            AddKit.UseVisualStyleBackColor = true;
@@ -106,29 +93,26 @@
            // 
            // KitTextbox
            // 
-            KitTextbox.Location = new Point(13, 22);
-            KitTextbox.Margin = new Padding(3, 2, 3, 2);
+            KitTextbox.Location = new Point(15, 30);
            KitTextbox.Name = "KitTextbox";
-            KitTextbox.Size = new Size(166, 23);
+            KitTextbox.Size = new Size(189, 27);
            KitTextbox.TabIndex = 1;
            // 
            // listBoxStorages
            // 
            listBoxStorages.FormattingEnabled = true;
-            listBoxStorages.ItemHeight = 15;
-            listBoxStorages.Location = new Point(10, 82);
-            listBoxStorages.Margin = new Padding(3, 2, 3, 2);
+            listBoxStorages.ItemHeight = 20;
+            listBoxStorages.Location = new Point(11, 109);
            listBoxStorages.Name = "listBoxStorages";
-            listBoxStorages.Size = new Size(169, 79);
+            listBoxStorages.Size = new Size(193, 104);
            listBoxStorages.TabIndex = 0;
            listBoxStorages.SelectedIndexChanged += ListBoxObjects_SelectedIndexChanged;
            // 
            // ButtonRefreshCollection
            // 
-            ButtonRefreshCollection.Location = new Point(24, 336);
-            ButtonRefreshCollection.Margin = new Padding(3, 2, 3, 2);
+            ButtonRefreshCollection.Location = new Point(28, 481);
            ButtonRefreshCollection.Name = "ButtonRefreshCollection";
-            ButtonRefreshCollection.Size = new Size(169, 28);
+            ButtonRefreshCollection.Size = new Size(193, 37);
            ButtonRefreshCollection.TabIndex = 3;
            ButtonRefreshCollection.Text = "Обновить коллекцию";
            ButtonRefreshCollection.UseVisualStyleBackColor = true;
@@ -136,10 +120,9 @@
            // 
            // ButtonRemoveBomber
            // 
-            ButtonRemoveBomber.Location = new Point(24, 301);
-            ButtonRemoveBomber.Margin = new Padding(3, 2, 3, 2);
+            ButtonRemoveBomber.Location = new Point(28, 416);
            ButtonRemoveBomber.Name = "ButtonRemoveBomber";
-            ButtonRemoveBomber.Size = new Size(169, 31);
+            ButtonRemoveBomber.Size = new Size(193, 41);
            ButtonRemoveBomber.TabIndex = 2;
            ButtonRemoveBomber.Text = "Удалить самолёт";
            ButtonRemoveBomber.UseVisualStyleBackColor = true;
@@ -147,10 +130,9 @@
            // 
            // ButtonAddBomber
            // 
-            ButtonAddBomber.Location = new Point(24, 241);
-            ButtonAddBomber.Margin = new Padding(3, 2, 3, 2);
+            ButtonAddBomber.Location = new Point(28, 321);
            ButtonAddBomber.Name = "ButtonAddBomber";
-            ButtonAddBomber.Size = new Size(169, 31);
+            ButtonAddBomber.Size = new Size(193, 41);
            ButtonAddBomber.TabIndex = 1;
            ButtonAddBomber.Text = "Добавить самолёт";
            ButtonAddBomber.UseVisualStyleBackColor = true;
@@ -158,73 +140,26 @@
            // 
            // MessageBoxBomber
            // 
-            MessageBoxBomber.Location = new Point(24, 276);
-            MessageBoxBomber.Margin = new Padding(3, 2, 3, 2);
+            MessageBoxBomber.Location = new Point(28, 368);
            MessageBoxBomber.Name = "MessageBoxBomber";
-            MessageBoxBomber.Size = new Size(169, 23);
+            MessageBoxBomber.Size = new Size(193, 27);
            MessageBoxBomber.TabIndex = 0;
            // 
            // PicBoxBomberCollection
            // 
-            PicBoxBomberCollection.Location = new Point(7, 28);
-            PicBoxBomberCollection.Margin = new Padding(3, 2, 3, 2);
+            PicBoxBomberCollection.Location = new Point(1, -2);
            PicBoxBomberCollection.Name = "PicBoxBomberCollection";
-            PicBoxBomberCollection.Size = new Size(473, 422);
+            PicBoxBomberCollection.Size = new Size(473, 563);
            PicBoxBomberCollection.TabIndex = 1;
            PicBoxBomberCollection.TabStop = false;
            // 
-            // menuStrip
-            // 
-            menuStrip.ImageScalingSize = new Size(20, 20);
-            menuStrip.Items.AddRange(new ToolStripItem[] { fileToolStripMenuItem });
-            menuStrip.Location = new Point(0, 0);
-            menuStrip.Name = "menuStrip";
-            menuStrip.Padding = new Padding(5, 2, 0, 2);
-            menuStrip.Size = new Size(700, 24);
-            menuStrip.TabIndex = 2;
-            menuStrip.Text = "Файл";
-            // 
-            // fileToolStripMenuItem
-            // 
-            fileToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { SaveToolStripMenuItem, LoadToolStripMenuItem });
-            fileToolStripMenuItem.Name = "fileToolStripMenuItem";
-            fileToolStripMenuItem.Size = new Size(48, 20);
-            fileToolStripMenuItem.Text = "Файл";
-            // 
-            // SaveToolStripMenuItem
-            // 
-            SaveToolStripMenuItem.Name = "SaveToolStripMenuItem";
-            SaveToolStripMenuItem.Size = new Size(141, 22);
-            SaveToolStripMenuItem.Text = "Сохранение";
-            SaveToolStripMenuItem.Click += SaveToolStripMenuItem_Click;
-            // 
-            // LoadToolStripMenuItem
-            // 
-            LoadToolStripMenuItem.Name = "LoadToolStripMenuItem";
-            LoadToolStripMenuItem.Size = new Size(141, 22);
-            LoadToolStripMenuItem.Text = "Загрузка";
-            LoadToolStripMenuItem.Click += LoadToolStripMenuItem_Click;
-            // 
-            // openFileDialog
-            // 
-            openFileDialog.FileName = "openFileDialog";
-            openFileDialog.Filter = "txt file | *.txt";
-            // 
-            // saveFileDialog
-            // 
-            saveFileDialog.FileName = "saveFileDialog";
-            saveFileDialog.Filter = "txt file | *.txt";
-            // 
            // FormBomberCollection
            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleDimensions = new SizeF(8F, 20F);
            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(700, 467);
+            ClientSize = new Size(800, 581);
            Controls.Add(PicBoxBomberCollection);
            Controls.Add(Tools);
-            Controls.Add(menuStrip);
-            MainMenuStrip = menuStrip;
-            Margin = new Padding(3, 2, 3, 2);
            Name = "FormBomberCollection";
            Text = "FormBomberCollection";
            Tools.ResumeLayout(false);
@@ -232,10 +167,7 @@
            Kit.ResumeLayout(false);
            Kit.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)PicBoxBomberCollection).EndInit();
-            menuStrip.ResumeLayout(false);
-            menuStrip.PerformLayout();
            ResumeLayout(false);
-            PerformLayout();
        }

        #endregion
@@ -251,11 +183,5 @@
        private Button RemoveKit;
        private Button AddKit;
        private TextBox KitTextbox;
-        private MenuStrip menuStrip;
-        private ToolStripMenuItem fileToolStripMenuItem;
-        private ToolStripMenuItem SaveToolStripMenuItem;
-        private ToolStripMenuItem LoadToolStripMenuItem;
-        private OpenFileDialog openFileDialog;
-        private OpenFileDialog saveFileDialog;
    }
 }
--- a/AirBomber/FormBomberCollection.cs
+++ b/AirBomber/FormBomberCollection.cs
@@ -10,9 +10,6 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using System.Xml.Linq;
-using AirBomber.Exceptions;
-using Microsoft.Extensions.Logging;

 namespace AirBomber
 {
@@ -20,13 +17,10 @@ namespace AirBomber
    {
        private readonly BomberGenericStorage _bomber;

-        private readonly ILogger _logger;
-
-        public FormBomberCollection(ILogger<FormBomberCollection> logger)
+        public FormBomberCollection()
        {
            InitializeComponent();
            _bomber = new BomberGenericStorage(PicBoxBomberCollection.Width, PicBoxBomberCollection.Height);
-            _logger = logger;
        }

        private void ReloadObjects()
@@ -63,45 +57,41 @@ namespace AirBomber
            }
            PicBoxBomberCollection.Image = obj.ShowBomber();
        }
-        private void AddBomber(DrawningBomber bomber)
-        {

-            var obj = _bomber[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
-            if (obj == null)
-            {
-                _logger.LogWarning("Добавление пустого объекта");
-                return;
-            }
-            try
-            {
-                _ = obj + bomber;
-
-                MessageBox.Show("Объект добавлен");
-                PicBoxBomberCollection.Image = obj.ShowBomber();
-                _logger.LogInformation($"Добавлен объект в набор {listBoxStorages.SelectedItem.ToString()}");
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show("Не удалось добавить объект");
-                _logger.LogWarning($"{ex.Message} в наборе {listBoxStorages.SelectedItem.ToString()}");
-            }
-        }
        private void ButtonAddBomber_Click(object sender, EventArgs e)
        {
            if (listBoxStorages.SelectedIndex == -1)
            {
                return;
            }
-            FormBomberConfig form = new FormBomberConfig();
-            form.Show();
-            form.AddEvent(AddBomber);
+            var formBomberConfig = new FormBomberConfig();
+
+            formBomberConfig.AddEvent(bomber =>
+            {
+                if (listBoxStorages.SelectedIndex != -1)
+                {
+                    var obj = _bomber[listBoxStorages.SelectedItem?.ToString() ?? string.Empty];
+                    if (obj != null)
+                    {
+                        if (obj + bomber != 1)
+                        {
+                            MessageBox.Show("Объект добавлен");
+                            PicBoxBomberCollection.Image = obj.ShowBomber();
+                        }
+                        else
+                        {
+                            MessageBox.Show("Не удалось добавить объект");
+                        }
+                    }
+                }
+            });
+            formBomberConfig.Show();
        }

        private void ButtonRemoveBomber_Click(object sender, EventArgs e)
        {
            if (listBoxStorages.SelectedIndex == -1)
            {
-                _logger.LogWarning("Удаление объекта из несуществующего набора");
                return;
            }
            var obj = _bomber[listBoxStorages.SelectedItem.ToString() ??
@@ -116,24 +106,14 @@ namespace AirBomber
                return;
            }
            int pos = Convert.ToInt32(MessageBoxBomber.Text);
-            try
+            if (obj - pos != null)
            {
-                if (obj - pos != null)
-                {
-                    MessageBox.Show("Объект удален");
-                    PicBoxBomberCollection.Image = obj.ShowBomber();
-                    _logger.LogInformation($"Удален объект из набора {listBoxStorages.SelectedItem.ToString()}");
-                }
-                else
-                {
-                    MessageBox.Show("Не удалось удалить объект");
-                    _logger.LogWarning($"Не удалось удалить объект из набора {listBoxStorages.SelectedItem.ToString()}");
-                }
+                MessageBox.Show("Объект удален");
+                PicBoxBomberCollection.Image = obj.ShowBomber();
            }
-            catch (BomberNotFoundException ex)
+            else
            {
-                MessageBox.Show(ex.Message);
-                _logger.LogWarning($"{ex.Message} из набора {listBoxStorages.SelectedItem.ToString()}");
+                MessageBox.Show("Не удалось удалить объект");
            }
        }

@@ -143,28 +123,23 @@ namespace AirBomber
            {
                MessageBox.Show("Не все данные заполнены", "Ошибка",
                MessageBoxButtons.OK, MessageBoxIcon.Error);
-                _logger.LogWarning("Пустое название набора");
                return;
            }
            _bomber.AddSet(KitTextbox.Text);
            ReloadObjects();
-            _logger.LogInformation($"Добавлен набор: {KitTextbox.Text}");
        }

        private void RemoveKit_Click(object sender, EventArgs e)
        {
            if (listBoxStorages.SelectedIndex == -1)
            {
-                _logger.LogWarning("Удаление невыбранного набора");
                return;
            }
-            string name = listBoxStorages.SelectedItem.ToString() ?? string.Empty;
            if (MessageBox.Show($"Удалить объект {listBoxStorages.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
            {
                _bomber.DelSet(listBoxStorages.SelectedItem.ToString()
                ?? string.Empty);
                ReloadObjects();
-                _logger.LogInformation($"Удален набор: {name}");
            }
        }
        private void ListBoxObjects_SelectedIndexChanged(object sender, EventArgs e)
@@ -172,42 +147,5 @@ namespace AirBomber
            PicBoxBomberCollection.Image =
            _bomber[listBoxStorages.SelectedItem?.ToString() ?? string.Empty]?.ShowBomber();
        }
-
-        private void SaveToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            if (saveFileDialog.ShowDialog() == DialogResult.OK)
-            {
-                try
-                {
-                    _bomber.SaveData(saveFileDialog.FileName);
-                    MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                    _logger.LogInformation($"Сохранение наборов в файл {saveFileDialog.FileName}");
-                }
-                catch (Exception ex)
-                {
-                    MessageBox.Show($"Не сохранилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    _logger.LogWarning($"Не удалось сохранить наборы с ошибкой: {ex.Message}");
-                }
-            }
-        }
-
-        private void LoadToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            if (openFileDialog.ShowDialog() == DialogResult.OK)
-            {
-                try
-                {
-                    _bomber.LoadData(openFileDialog.FileName);
-                    ReloadObjects();
-                    MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                    _logger.LogInformation($"Загрузились наборы из файла {openFileDialog.FileName}");
-                }
-                catch (Exception ex)
-                {
-                    MessageBox.Show($"Не загрузилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    _logger.LogWarning($"Не удалось сохранить наборы с ошибкой: {ex.Message}");
-                }
-            }
-        }
    }
 }
--- a/AirBomber/FormBomberCollection.resx
+++ b/AirBomber/FormBomberCollection.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="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>145, 1</value>
-  </metadata>
-  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>315, 1</value>
-  </metadata>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>62</value>
-  </metadata>
 </root>
--- a/AirBomber/Program.cs
+++ b/AirBomber/Program.cs
@@ -1,8 +1,3 @@
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Serilog;
-
 namespace AirBomber
 {
    internal static class Program
@@ -16,30 +11,7 @@ namespace AirBomber
            // 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<FormBomberCollection>());
-            }
-
-        }
-
-        private static void ConfigureServices(ServiceCollection services)
-        {
-            services.AddSingleton<FormBomberCollection>().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}appsettings.json", optional: false, reloadOnChange: true).Build(); var logger = new LoggerConfiguration().ReadFrom.Configuration(configuration).CreateLogger();
-
-                option.SetMinimumLevel(LogLevel.Information);
-                option.AddSerilog(logger);
-            });
+            Application.Run(new FormBomberCollection());
        }
    }
 }
--- a/AirBomber/SetGeneric.cs
+++ b/AirBomber/SetGeneric.cs
@@ -1,5 +1,4 @@
-using AirBomber.Exceptions;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
@@ -54,11 +53,12 @@ namespace ProjectBomber.Generics
        public int Insert(T plane, int position)
        {
            if (position < 0 || position >= _maxCount)
-                throw new BomberNotFoundException(position);
+                return -1;

            if (Count >= _maxCount)
-                throw new StorageOverflowException(position);
-            _places.Insert(0, plane);
+                return -1;
+
+            _places.Insert(position, plane);
            return position;
        }
        /// <summary>
@@ -69,15 +69,13 @@ namespace ProjectBomber.Generics
        public bool Remove(int position)
        {
            /// Проверка позиции
-            if (position < 0 || position > _maxCount || position >= Count)
-                throw new BomberNotFoundException(position);
-            /// Удаление объекта из массива, присвоив элементу массива значение null
+            if ((position < 0) || (position > _maxCount)) return false;
            _places.RemoveAt(position);
            return true;
        }
        /// <summary>
        /// Получение объекта из набора по позиции
-        /// </summary>  
+        /// </summary>
        /// <param name="position"></param>
        /// <returns></returns>
        public T? this[int position]
@@ -86,16 +84,12 @@ namespace ProjectBomber.Generics
            {
                if (position < 0 || position > _maxCount)
                    return null;
-                if (_places.Count <= position)
-                    return null;
                return _places[position];
            }
            set
            {
                if (position < 0 || position > _maxCount)
                    return;
-                if (_places.Count <= position)
-                    return;
                _places[position] = value;
            }
        }
--- a/AirBomber/StorageOverflowException.cs
+++ b/AirBomber/StorageOverflowException.cs
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Serialization;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AirBomber.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) { }
-    }
-}
--- a/AirBomber/appsettings.json
+++ b/AirBomber/appsettings.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": "GasolineTanker"
-    }
-  }
-}