13 changed files with 21 additions and 451 deletions
--- a/AirplaneWithRadar/ProjectAirplaneWithRadar/CollectionGenericObjects/AbstractCompany.cs
+++ b/AirplaneWithRadar/ProjectAirplaneWithRadar/CollectionGenericObjects/AbstractCompany.cs
@ -48,7 +48,7 @@ namespace ProjectAirplaneWithRadar.CollectionGenericObjects
            _pictureWidth = picWidth;
            _pictureHeight = picHeight;
            _collection = collection;
-            _collection.MaxCount = GetMaxCount;
+            _collection.SetMaxCount = GetMaxCount;
        }

        /// <summary>
--- a/AirplaneWithRadar/ProjectAirplaneWithRadar/CollectionGenericObjects/ICollectionGenericObjects.cs
+++ b/AirplaneWithRadar/ProjectAirplaneWithRadar/CollectionGenericObjects/ICollectionGenericObjects.cs
@ -17,7 +17,7 @@ namespace ProjectAirplaneWithRadar.CollectionGenericObjects
        /// <summary>
        /// Установка максимального количества элементов
        /// </summary>
-        int MaxCount { get; set; }
+        int SetMaxCount { set; }

        /// <summary>
        /// Добавление объекта в коллекцию
@ -47,17 +47,5 @@ namespace ProjectAirplaneWithRadar.CollectionGenericObjects
        /// <param name="position">Позиция</param>
        /// <returns>Объект</returns>
        T? Get(int position);
-
-        /// <summary>
-        /// Получение типа коллекции
-        /// </summary>
-        CollectionType GetCollectionType { get; }
-
-        /// <summary>
-        /// Получение объектов коллекции по одному
-        /// </summary>
-        /// <returns>Поэлементый вывод элементов коллекции</returns>
-        IEnumerable<T?> GetItems();
-
    }
 }
--- a/AirplaneWithRadar/ProjectAirplaneWithRadar/CollectionGenericObjects/ListGenericObjects.cs
+++ b/AirplaneWithRadar/ProjectAirplaneWithRadar/CollectionGenericObjects/ListGenericObjects.cs
@ -1,5 +1,4 @@
-
-namespace ProjectAirplaneWithRadar.CollectionGenericObjects
+namespace ProjectAirplaneWithRadar.CollectionGenericObjects
 {
    /// <summary>
    /// Параметризованный набор объектов
@ -20,22 +19,7 @@ namespace ProjectAirplaneWithRadar.CollectionGenericObjects

        public int Count => _collection.Count;

-        public int MaxCount {
-            get
-            {
-                return _maxCount;
-            }
-
-            set 
-            { 
-                if (value > 0) 
-                { 
-                    _maxCount = value; 
-                } 
-            }             
-        }
-
-        public CollectionType GetCollectionType => CollectionType.List;
+        public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } }

        /// <summary>
        /// Конструктор
@ -80,13 +64,5 @@ namespace ProjectAirplaneWithRadar.CollectionGenericObjects
            _collection.RemoveAt(position);
            return temp;
        }
-
-        public IEnumerable<T?> GetItems()
-        {
-            for (int i = 0; i < _collection.Count; ++i)
-            {
-                yield return _collection[i];
-            }
-        }
    }
 }
--- a/AirplaneWithRadar/ProjectAirplaneWithRadar/CollectionGenericObjects/MassiveGenericObjects.cs
+++ b/AirplaneWithRadar/ProjectAirplaneWithRadar/CollectionGenericObjects/MassiveGenericObjects.cs
@ -1,5 +1,4 @@
-
-namespace ProjectAirplaneWithRadar.CollectionGenericObjects
+namespace ProjectAirplaneWithRadar.CollectionGenericObjects
 {
    /// <summary>
    /// Параметризованный набор объектов
@ -15,13 +14,8 @@ namespace ProjectAirplaneWithRadar.CollectionGenericObjects

        public int Count => _collection.Length;

-        public int MaxCount
+        public int SetMaxCount
        {
-            get
-            {
-                return _collection.Length;
-            }
-
            set
            {
                if (value > 0)
@ -35,11 +29,9 @@ namespace ProjectAirplaneWithRadar.CollectionGenericObjects
                        _collection = new T?[value];
                    }
                }
-            }            
+            }
        }

-        public CollectionType GetCollectionType => CollectionType.Massive;
-
        /// <summary>
        /// Конструктор
        /// </summary>
@ -118,13 +110,5 @@ namespace ProjectAirplaneWithRadar.CollectionGenericObjects
            _collection[position] = null;
            return temp;
        }
-
-        public IEnumerable<T?> GetItems()
-        {
-            for (int i = 0; i < _collection.Length; ++i)
-            {
-                yield return _collection[i];
-            }
-        }
    }
 }
--- a/AirplaneWithRadar/ProjectAirplaneWithRadar/CollectionGenericObjects/StorageCollection.cs
+++ b/AirplaneWithRadar/ProjectAirplaneWithRadar/CollectionGenericObjects/StorageCollection.cs
@ -1,14 +1,11 @@
-using System.Text;
-using ProjectAirplaneWithRadar.Drawnings;
-
-namespace ProjectAirplaneWithRadar.CollectionGenericObjects
+namespace ProjectAirplaneWithRadar.CollectionGenericObjects
 {
    /// <summary>
    /// Класс-хранилище коллекций
    /// </summary>
    /// <typeparam name="T"></typeparam>
    public class StorageCollection<T>
-        where T : DrawningAirplane
+        where T : class
    {
        /// <summary>
        /// Словарь (хранилище) с коллекциями
@ -20,21 +17,6 @@ namespace ProjectAirplaneWithRadar.CollectionGenericObjects
        /// </summary>
        public List<string> Keys => _storages.Keys.ToList();

-        /// <summary>
-        /// Ключевое слово, с которого должен начинаться файл
-        /// </summary>
-        private readonly string _collectionKey = "CollectionsStorage";
-
-        /// <summary>
-        /// Разделитель для записи ключа и значения элемента словаря
-        /// </summary>
-        private readonly string _separatorForKeyValue = "|";
-
-        /// <summary>
-        /// Разделитель для записей коллекции данных в файл
-        /// </summary>
-        private readonly string _separatorItems = ";";
-
        /// <summary>
        /// Конструктор
        /// </summary>
@ -91,137 +73,5 @@ namespace ProjectAirplaneWithRadar.CollectionGenericObjects
                return _storages[name];
            }
        }
-
-        /// <summary>
-        /// Сохранение информации по самолетам в хранилище в файл
-        /// </summary>
-        /// <param name="filename">Путь и имя файла</param>
-        /// <returns>true - сохранение прошло успешно, false - ошибка при сохранении данных</returns>
-        public bool SaveData(string filename)
-        {
-            if(_storages.Count == 0)
-                return false;
-
-            if(File.Exists(filename))
-                File.Delete(filename);
-
-            StringBuilder sb = new();
-
-            sb.Append(_collectionKey);
-            foreach(KeyValuePair<string, ICollectionGenericObjects<T>> value in _storages)
-            {
-                sb.Append(Environment.NewLine);
-
-                if (value.Value.Count == 0)
-                    continue;
-
-                sb.Append(value.Key);
-                sb.Append(_separatorForKeyValue);
-                sb.Append(value.Value.GetCollectionType);
-                sb.Append(_separatorForKeyValue);
-                sb.Append(value.Value.MaxCount);
-                sb.Append(_separatorForKeyValue);
-
-                foreach (T? item in value.Value.GetItems())
-                {
-                    string data = item?.GetDataForSave() ?? string.Empty;
-                    if (string.IsNullOrEmpty(data))
-                    {
-                        continue;
-                    }
-
-                    sb.Append(data);
-                    sb.Append(_separatorItems);
-                }
-            }
-
-            using FileStream fs = new(filename, FileMode.Create);
-            byte[] info = new UTF8Encoding(true).GetBytes(sb.ToString());
-            fs.Write(info, 0, info.Length);
-            return true;
-        }
-
-        /// <summary>
-        /// Загрузка информации по самолетам в хранилище из файла
-        /// </summary>
-        /// <param name="filename">Путь и имя файла</param>
-        /// <returns>true - загрузка прошла успешно, false - ошибка при загрузке данных</returns>
-        public bool LoadData(string filename)
-        {
-            if (!File.Exists(filename))
-            {
-                return false;
-            }
-
-            string bufferTextFromFile = "";
-            using (FileStream fs = new(filename, FileMode.Open))
-            {
-                byte[] b = new byte[fs.Length];
-                UTF8Encoding temp = new(true);
-                while (fs.Read(b, 0, b.Length) > 0)
-                {
-                    bufferTextFromFile += temp.GetString(b);
-                }
-            }
-
-            string[] strs = bufferTextFromFile.Split(new char[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries);
-            if (strs == null || strs.Length == 0)
-            {
-                return false;
-            }
-
-            if (!strs[0].Equals(_collectionKey))
-            {
-                return false;
-            }
-
-            _storages.Clear();
-            foreach (string data in strs)
-            {
-                string[] record = data.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
-                if (record.Length != 4)
-                {
-                    continue;
-                }
-
-                CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]);
-                ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionType);
-                if (collection == null)
-                {
-                    return false;
-                }
-
-                collection.MaxCount = Convert.ToInt32(record[2]);
-
-                string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
-                foreach (string elem in set)
-                {
-                    if (elem?.CreateDrawningAirplane() is T airplane)
-                    {
-                        if (collection.Insert(airplane) == -1)
-                            return false;
-                    }
-                }
-
-                _storages.Add(record[0], collection);
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        /// Создание коллекции по типу
-        /// </summary>
-        /// <param name="collectionType"></param>
-        /// <returns></returns>
-        private static ICollectionGenericObjects<T>? CreateCollection(CollectionType collectionType)
-        {
-            return collectionType switch
-            {
-                CollectionType.Massive => new MassiveGenericObjects<T>(),
-                CollectionType.List => new ListGenericObjects<T>(),
-                _ => null,
-            };
-        }
    }
 }
--- a/AirplaneWithRadar/ProjectAirplaneWithRadar/Drawnings/DrawingAirplaneWithRadar.cs
+++ b/AirplaneWithRadar/ProjectAirplaneWithRadar/Drawnings/DrawingAirplaneWithRadar.cs
@ -6,7 +6,7 @@ namespace ProjectAirplaneWithRadar.Drawnings
    /// Класс, отвечающий за прорисовку и перемещение объекта-сущности
    /// </summary>
    public class DrawingAirplaneWithRadar : DrawningAirplane
-    {   
+    {
        /// <summary>
        /// Инициализация свойств
        /// </summary>
@ -21,16 +21,6 @@ namespace ProjectAirplaneWithRadar.Drawnings
            EntityAirplane = new EntityAirplaneWithRadar(speed, weight, bodyColor, additionalColor, wheels, radar);
        }

-        /// <summary>
-        /// Конструктор для метода создания объекта из строки (ExtentionDrawningAirplane)
-        /// </summary>
-        /// <param name="airplane"></param>
-        public DrawingAirplaneWithRadar(EntityAirplane? airplane) : base(airplane)
-        {
-            if (airplane != null)
-                EntityAirplane = airplane;
-        }
-
        /// <summary>
        /// Прорисовка объекта
        /// </summary>
--- a/AirplaneWithRadar/ProjectAirplaneWithRadar/Drawnings/DrawningAirplane.cs
+++ b/AirplaneWithRadar/ProjectAirplaneWithRadar/Drawnings/DrawningAirplane.cs
@ -83,15 +83,6 @@ namespace ProjectAirplaneWithRadar.Drawnings
            EntityAirplane = new EntityAirplane(speed, weight, bodyColor);
        }

-        /// <summary>
-        /// Конструктор для метода создания объекта из строки (ExtentionDrawningAirplane)
-        /// </summary>
-        /// <param name="airplane"></param>
-        public DrawningAirplane(EntityAirplane? airplane) : this()
-        {
-            EntityAirplane = airplane;
-        }
-
        /// <summary>
        /// Конструктор для наследников
        /// </summary>
--- a/AirplaneWithRadar/ProjectAirplaneWithRadar/Drawnings/ExtentionDrawningAirplane.cs
+++ b/AirplaneWithRadar/ProjectAirplaneWithRadar/Drawnings/ExtentionDrawningAirplane.cs
@ -1,55 +0,0 @@
-using ProjectAirplaneWithRadar.Entities;
-
-namespace ProjectAirplaneWithRadar.Drawnings
-{
-    public static class ExtentionDrawningAirplane
-    {
-        /// <summary>
-        /// Разделитель для записи информации по объекту в файл
-        /// </summary>
-        private static readonly string _separatorForObject = ":";
-
-        /// <summary>
-        /// Создание объекта из строки
-        /// </summary>
-        /// <param name="info">Строка с данными для создания объекта</param>
-        /// <returns>Объект</returns>
-        public static DrawningAirplane? CreateDrawningAirplane(this string info)
-        {
-            string[] strs = info.Split(_separatorForObject);
-            EntityAirplane? airplane = EntityAirplaneWithRadar.CreateEntityAirplaneWithRadar(strs);
-
-            if (airplane != null)
-            {
-                return new DrawingAirplaneWithRadar(airplane);
-            }
-
-            airplane = EntityAirplane.CreateEntityAirplane(strs);
-
-            if (airplane != null)
-            {
-                return new DrawningAirplane(airplane);
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Получение данных для сохранения в файл
-        /// </summary>
-        /// <param name="drawningAirplane">Сохраняемый объект</param>
-        /// <returns>Строка с данными по объекту</returns>
-        public static string GetDataForSave(this DrawningAirplane drawningAirplane)
-        {
-            string[]? array = drawningAirplane?.EntityAirplane?.GetStringRepresentation();
-
-            if (array == null)
-            {
-                return string.Empty;
-            }
-
-            return string.Join(_separatorForObject, array);
-        }
-
-    }
-}
--- a/AirplaneWithRadar/ProjectAirplaneWithRadar/Entities/EntityAirplane.cs
+++ b/AirplaneWithRadar/ProjectAirplaneWithRadar/Entities/EntityAirplane.cs
@ -46,27 +46,5 @@
        {
            BodyColor = bodyColor;
        }
-
-        /// <summary>
-        /// Получение строк со значениями свойств объекта класса-сущности
-        /// </summary>
-        /// <returns></returns>
-        public virtual string[] GetStringRepresentation()
-        {
-            return new[] { nameof(EntityAirplane), Speed.ToString(), Weight.ToString(), BodyColor.Name };
-        }
-
-        /// <summary>
-        /// Создание объекта из массива строк
-        /// </summary>
-        /// <param name="strs"></param>
-        /// <returns></returns>
-        public static EntityAirplane? CreateEntityAirplane(string[] strs)
-        {
-            if (strs.Length != 4 || strs[0] != nameof(EntityAirplane))            
-                return null;
-            
-            return new EntityAirplane(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]));
-        }
    }
 }
--- a/AirplaneWithRadar/ProjectAirplaneWithRadar/Entities/EntityAirplaneWithRadar.cs
+++ b/AirplaneWithRadar/ProjectAirplaneWithRadar/Entities/EntityAirplaneWithRadar.cs
@ -44,29 +44,5 @@
        {
            AdditionalColor = additionalColor;
        }
-
-        /// <summary>
-        /// Переопределение метода создания объекта из массива строк
-        /// </summary>
-        /// <returns></returns>
-        public override string[] GetStringRepresentation()
-        {
-            return new[] { nameof(EntityAirplaneWithRadar), Speed.ToString(), Weight.ToString(), BodyColor.Name, AdditionalColor.Name, Wheels.ToString(), Radar.ToString() };
-        }
-
-        /// <summary>
-        /// Создание объекта из массива строк
-        /// </summary>
-        /// <param name="strs"></param>
-        /// <returns></returns>
-        public static EntityAirplaneWithRadar? CreateEntityAirplaneWithRadar(string[] strs)
-        {
-            if (strs.Length != 7 || strs[0] != nameof(EntityAirplaneWithRadar))
-                return null;
-
-            return new EntityAirplaneWithRadar(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), 
-                Color.FromName(strs[3]), Color.FromName(strs[4]), 
-                Convert.ToBoolean(strs[5]), Convert.ToBoolean(strs[6]));
-        }
    }
 }
--- a/AirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplaneCollection.Designer.cs
+++ b/AirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplaneCollection.Designer.cs
@ -46,17 +46,10 @@
            labelCollectionName = new Label();
            comboBoxSelectorCompany = new ComboBox();
            pictureBox = new PictureBox();
-            menuStrip = new MenuStrip();
-            файлToolStripMenuItem = new ToolStripMenuItem();
-            saveToolStripMenuItem = new ToolStripMenuItem();
-            loadToolStripMenuItem = new ToolStripMenuItem();
-            saveFileDialog = new SaveFileDialog();
-            openFileDialog = new OpenFileDialog();
            groupBoxTools.SuspendLayout();
            panelCompanyTools.SuspendLayout();
            panelStorage.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
-            menuStrip.SuspendLayout();
            SuspendLayout();
            // 
            // groupBoxTools
@ -66,9 +59,9 @@
            groupBoxTools.Controls.Add(panelStorage);
            groupBoxTools.Controls.Add(comboBoxSelectorCompany);
            groupBoxTools.Dock = DockStyle.Right;
-            groupBoxTools.Location = new Point(883, 24);
+            groupBoxTools.Location = new Point(883, 0);
            groupBoxTools.Name = "groupBoxTools";
-            groupBoxTools.Size = new Size(206, 583);
+            groupBoxTools.Size = new Size(206, 607);
            groupBoxTools.TabIndex = 0;
            groupBoxTools.TabStop = false;
            groupBoxTools.Text = "Инструменты";
@ -82,7 +75,7 @@
            panelCompanyTools.Controls.Add(buttonGoToCheck);
            panelCompanyTools.Dock = DockStyle.Bottom;
            panelCompanyTools.Enabled = false;
-            panelCompanyTools.Location = new Point(3, 393);
+            panelCompanyTools.Location = new Point(3, 417);
            panelCompanyTools.Name = "panelCompanyTools";
            panelCompanyTools.Size = new Size(200, 187);
            panelCompanyTools.TabIndex = 8;
@ -247,52 +240,12 @@
            // pictureBox
            // 
            pictureBox.Dock = DockStyle.Fill;
-            pictureBox.Location = new Point(0, 24);
+            pictureBox.Location = new Point(0, 0);
            pictureBox.Name = "pictureBox";
-            pictureBox.Size = new Size(883, 583);
+            pictureBox.Size = new Size(883, 607);
            pictureBox.TabIndex = 1;
            pictureBox.TabStop = false;
            // 
-            // menuStrip
-            // 
-            menuStrip.Items.AddRange(new ToolStripItem[] { файлToolStripMenuItem });
-            menuStrip.Location = new Point(0, 0);
-            menuStrip.Name = "menuStrip";
-            menuStrip.Size = new Size(1089, 24);
-            menuStrip.TabIndex = 2;
-            menuStrip.Text = "menuStrip";
-            // 
-            // файлToolStripMenuItem
-            // 
-            файлToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { saveToolStripMenuItem, loadToolStripMenuItem });
-            файлToolStripMenuItem.Name = "файлToolStripMenuItem";
-            файлToolStripMenuItem.Size = new Size(48, 20);
-            файлToolStripMenuItem.Text = "Файл";
-            // 
-            // saveToolStripMenuItem
-            // 
-            saveToolStripMenuItem.Name = "saveToolStripMenuItem";
-            saveToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.S;
-            saveToolStripMenuItem.Size = new Size(181, 22);
-            saveToolStripMenuItem.Text = "Сохранение";
-            saveToolStripMenuItem.Click += SaveToolStripMenuItem_Click;
-            // 
-            // loadToolStripMenuItem
-            // 
-            loadToolStripMenuItem.Name = "loadToolStripMenuItem";
-            loadToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.L;
-            loadToolStripMenuItem.Size = new Size(181, 22);
-            loadToolStripMenuItem.Text = "Загрузка";
-            loadToolStripMenuItem.Click += LoadToolStripMenuItem_Click;
-            // 
-            // saveFileDialog
-            // 
-            saveFileDialog.Filter = "txt file | *.txt";
-            // 
-            // openFileDialog
-            // 
-            openFileDialog.Filter = "txt file | *.txt";
-            // 
            // FormAirplaneCollection
            // 
            AutoScaleDimensions = new SizeF(7F, 15F);
@ -300,8 +253,6 @@
            ClientSize = new Size(1089, 607);
            Controls.Add(pictureBox);
            Controls.Add(groupBoxTools);
-            Controls.Add(menuStrip);
-            MainMenuStrip = menuStrip;
            Name = "FormAirplaneCollection";
            Text = "Коллекция самолетов";
            groupBoxTools.ResumeLayout(false);
@ -310,10 +261,7 @@
            panelStorage.ResumeLayout(false);
            panelStorage.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
-            menuStrip.ResumeLayout(false);
-            menuStrip.PerformLayout();
            ResumeLayout(false);
-            PerformLayout();
        }

        #endregion
@ -336,11 +284,5 @@
        private ListBox listBoxCollection;
        private Button buttonCollectionAdd;
        private Panel panelCompanyTools;
-        private MenuStrip menuStrip;
-        private ToolStripMenuItem файлToolStripMenuItem;
-        private ToolStripMenuItem saveToolStripMenuItem;
-        private ToolStripMenuItem loadToolStripMenuItem;
-        private SaveFileDialog saveFileDialog;
-        private OpenFileDialog openFileDialog;
    }
 }
--- a/AirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplaneCollection.cs
+++ b/AirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplaneCollection.cs
@ -35,7 +35,7 @@ namespace ProjectAirplaneWithRadar
        private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
        {
            panelCompanyTools.Enabled = false;
-        }
+        }        

        /// <summary>
        /// Добавление самолета
@ -158,14 +158,14 @@ namespace ProjectAirplaneWithRadar
        /// <param name="e"></param>
        private void ButtonCollectionAdd_Click(object sender, EventArgs e)
        {
-            if (string.IsNullOrEmpty(textBoxCollectionName.Text) || (!radioButtonList.Checked && !radioButtonMassive.Checked))
+            if(string.IsNullOrEmpty(textBoxCollectionName.Text) || (!radioButtonList.Checked && !radioButtonMassive.Checked)) 
            {
                MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
                return;
            }

            CollectionType collectionType = CollectionType.None;
-            if (radioButtonMassive.Checked)
+            if(radioButtonMassive.Checked)
                collectionType = CollectionType.Massive;
            else if (radioButtonList.Checked)
                collectionType = CollectionType.List;
@ -181,7 +181,7 @@ namespace ProjectAirplaneWithRadar
        /// <param name="e"></param>
        private void ButtonCollectionDel_Click(object sender, EventArgs e)
        {
-            if (listBoxCollection.SelectedItems == null || listBoxCollection.SelectedIndex < 0)
+            if(listBoxCollection.SelectedItems == null || listBoxCollection.SelectedIndex < 0)
            {
                MessageBox.Show("Коллекция не выбрана");
                return;
@ -204,7 +204,7 @@ namespace ProjectAirplaneWithRadar
            for (int i = 0; i < _storageCollection.Keys?.Count; ++i)
            {
                string? colName = _storageCollection.Keys?[i];
-                if (!string.IsNullOrEmpty(colName))
+                if(!string.IsNullOrEmpty(colName))
                    listBoxCollection.Items.Add(colName);
            }
        }
@ -221,7 +221,7 @@ namespace ProjectAirplaneWithRadar
                MessageBox.Show("Коллекция не выбрана");
                return;
            }
-
+            
            ICollectionGenericObjects<DrawningAirplane>? collection = _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
            if (collection == null)
            {
@ -239,46 +239,5 @@ namespace ProjectAirplaneWithRadar
            panelCompanyTools.Enabled = true;
            RefreshListBoxItems();
        }
-
-        /// <summary>
-        /// Обработка нажатия "Сохранение"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void SaveToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            if (saveFileDialog.ShowDialog() == DialogResult.OK)
-            {
-                if (_storageCollection.SaveData(saveFileDialog.FileName))
-                {
-                    MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                }
-                else
-                {
-                    MessageBox.Show("Не сохранилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Обработка нажатия "Загрузка"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void LoadToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            if (openFileDialog.ShowDialog() == DialogResult.OK)
-            {
-                if (_storageCollection.LoadData(openFileDialog.FileName))
-                {
-                    MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                    RefreshListBoxItems();
-                }
-                else
-                {
-                    MessageBox.Show("Не сохранилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            }
-        }
    }
 }
--- a/AirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplaneCollection.resx
+++ b/AirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplaneCollection.resx
@ -117,13 +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="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>126, 17</value>
-  </metadata>
-  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>261, 17</value>
-  </metadata>
 </root>