Лабораторная работа №5(new)

ProectMilitaryAircraft/ProectMilitaryAircraft/CollectionGenericObjects/AbstractCompany.cs

@@ -48,7 +48,7 @@ public abstract class AbstractCompany
         _pictureWidth = picWidth;
         _pictureHeight = picHeight;
         _collection = collection;
-        _collection.MaxCount = GetMaxCount;
+        _collection.SetMaxCount = GetMaxCount;
         
     }
     /// <summary>

ProectMilitaryAircraft/ProectMilitaryAircraft/CollectionGenericObjects/AircraftSharingService.cs

@@ -16,6 +16,7 @@ public class AircraftSharingService : AbstractCompany
     private int? _startPosY;
     private int? ObjPositionX;
     private int? ObjPositionY;
+
     private void DrawPlace(Graphics g)
     {
         Pen pen = new(Color.Black);

ProectMilitaryAircraft/ProectMilitaryAircraft/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -23,7 +23,7 @@ public interface ICollectionGenericObjects<T>
     /// <summary>
     /// Установка максимального количества элементов
     /// </summary>
-    int MaxCount { get; set; }
+    int SetMaxCount { set; }
 
     /// <summary>
     /// Добавление объекта в коллекцию
@@ -53,15 +53,4 @@ public interface ICollectionGenericObjects<T>
     /// <param name="position">Позиция</param>
     /// <returns>Объект</returns>
     T? Get(int position);
-
-    /// <summary>
-	/// Получение типа коллекции
-	/// </summary>
-	CollectionType GetCollectionType { get; }
-
-    /// <summary>
-    /// Получение объектов коллекции по одному
-    /// </summary>
-    /// <returns>Поэлементый вывод элементов коллекции</returns>
-    IEnumerable<T?> GetItems();
 }

ProectMilitaryAircraft/ProectMilitaryAircraft/CollectionGenericObjects/ListgenericObjects.cs

@@ -11,7 +11,7 @@ namespace ProectMilitaryAircraft.CollectionGenericObjects;
 /// Параметризованный набор объектов
 /// </summary>
 /// <typeparam name="T">Параметр : ограничение - ссылочный тип</typeparam>
-public class ListGenericObjects<T> : ICollectionGenericObjects<T>
+public class ListgenericObjects<T> : ICollectionGenericObjects<T>
     where T : class
 {
     /// <summary>
@@ -26,25 +26,14 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
 
     public int Count => _collection.Count;
 
-    public int MaxCount
-    {
-        get => _maxCount;
-        set
-        {
-            if (value > 0)
-            {
-                _maxCount = value;
-            }
-        }
-    }
+    public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } }
 
     public CollectionType GetCollectionType => CollectionType.List;
 
-
     /// <summary>
     /// Конструктор
     /// </summary>
-    public ListGenericObjects()
+    public ListgenericObjects()
     {
         _collection = new();
     }
@@ -86,12 +75,4 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
         }
         return false;
     }
-
-    public IEnumerable<T?> GetItems()
-    {
-        for (int i = 0; i < _collection.Count; ++i)
-        {
-            yield return _collection[i];
-        }
-    }
 }

ProectMilitaryAircraft/ProectMilitaryAircraft/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -1,5 +1,4 @@
-using ProectMilitaryAircraft.Draw;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -12,7 +11,7 @@ namespace ProectMilitaryAircraft.CollectionGenericObjects
     /// </summary>
     /// <typeparam name="T">Параметр : Ограничение - ссылочный тип</typeparam>
     public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
-        where T : DrawningAircraft
+        where T : class
     {
         /// <summary>
         /// Массив объектов, которые храним
@@ -21,11 +20,8 @@ namespace ProectMilitaryAircraft.CollectionGenericObjects
 
         public int Count => _collection.Length;
 
-        public int MaxCount {
-            get
+        public int SetMaxCount
         {
-                return _collection.Length;
-            }
             set
             {
                 if (value > 0)
@@ -42,8 +38,6 @@ namespace ProectMilitaryAircraft.CollectionGenericObjects
             }
         }
 
-        public CollectionType GetCollectionType => CollectionType.Massive;
-
         /// <summary>
         /// Конструктор
         /// </summary>
@@ -119,13 +113,6 @@ namespace ProectMilitaryAircraft.CollectionGenericObjects
             return false;
         }
 
-        public IEnumerable<T?> GetItems()
-        {
-            for (int i = 0; i < _collection.Length; ++i)
-            {
-                yield return _collection[i];
-            }
-        }
     }
 
 }

ProectMilitaryAircraft/ProectMilitaryAircraft/CollectionGenericObjects/StorageCollection.cs

@@ -1,5 +1,4 @@
-using ProectMilitaryAircraft.Draw;
-using ProectMilitaryAircraft.MovementStrategy;
+using ProectMilitaryAircraft.MovementStrategy;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -9,7 +8,7 @@ using System.Threading.Tasks;
 namespace ProectMilitaryAircraft.CollectionGenericObjects;
 
 public class StorageCollection<T>
-    where T : DrawningAircraft
+    where T : class
 {
     readonly Dictionary<string, ICollectionGenericObjects<T>> _storages;
 
@@ -20,21 +19,6 @@ public class StorageCollection<T>
         _storages = new Dictionary<string, ICollectionGenericObjects<T>>();
     }
 
-    /// <summary>
-	/// Ключевое слово, с которого должен начинаться файл
-	/// </summary>
-	private readonly string _collectionKey = "CollectionsStorage";
-
-    /// <summary>
-    /// Разделитель для записи ключа и значения элемента словаря
-    /// </summary>
-    private readonly string _separatorForKeyValue = "|";
-
-    /// <summary>
-    /// Разделитель для записей коллекции данных в файл
-    /// </summary>
-    private readonly string _separatorItems = ";";
-
     public void AddCollection (string name, CollectionType collectionType)
     {
         if (name != null && !_storages.ContainsKey(name))
@@ -46,7 +30,7 @@ public class StorageCollection<T>
             }
             if (collectionType == CollectionType.List)
             {
-                _storages.Add(name, new ListGenericObjects<T>());
+                _storages.Add(name, new ListgenericObjects<T>());
             }
 
         }
@@ -73,145 +57,4 @@ public class StorageCollection<T>
             return null;
         }
     }
-
-    /// <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.Count);
-            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?.CreateDrawningCar() is T car)
-                {
-                    if (!collection.Insert(car))
-                    {
-                        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,
-        };
-    }
 }

ProectMilitaryAircraft/ProectMilitaryAircraft/Draw/DrawningAircraft.cs

@@ -33,7 +33,6 @@ public class DrawningAircraft
     /// Верхняя координа прорисовки самолета
     /// </summary>
     protected int? _startPosY;
-    public DrawningAircraft aircraft;
 
     /// <summary>
     /// Ширина прорисовки самолета
@@ -69,7 +68,7 @@ public class DrawningAircraft
     /// <summary>
     /// Пустой конструктор
     /// </summary>
-    public DrawningAircraft()
+    private DrawningAircraft()
     {
         _pictureWidth = null;
         _pictureHeight = null;
@@ -113,18 +112,6 @@ public class DrawningAircraft
         _drawingMilitaryAircraftHeight = drawingMilitaryAircraftHeight;
         EntityAircraft = new EntityAircraft(speed, weight, bodyColor);
     }
-
-    /// <summary>
-    /// Конструктор для Drawning
-    /// </summary>
-    /// <param name="speed"></param>
-    /// <param name="weight"></param>
-    /// <param name="bodyColor"></param>
-    public DrawningAircraft(EntityAircraft entityAircraft)
-    { 
-        EntityAircraft = entityAircraft;
-    }
-
     /// <summary>
     /// Установка границ поля
     /// </summary>
@@ -133,8 +120,10 @@ public class DrawningAircraft
     /// <returns>true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах</returns>
     public bool SetpictureSize(int width, int height)
     {
-        // TODO провека, что объект "влезает" в размеры поля
-        // если влезает, сохраняем границы и корректируем позицию объекта, если она была установлена
+        if (width <= _drawningMilitaryAircraftWidth || height <= _drawingMilitaryAircraftHeight)
+        {
+            return false;
+        }
         _pictureWidth = width;
         _pictureHeight = height;
         return true;

ProectMilitaryAircraft/ProectMilitaryAircraft/Draw/DrawningMilitaryAircraft.cs

@@ -15,8 +15,6 @@ namespace ProectMilitaryAircraft.Draw;
 /// </summary>
 public class DrawningMilitaryAircraft : DrawningAircraft
 {
-    private DrawningAircraft aircraft;
-
     /// <summary>
     /// Констуктор 
     /// </summary>
@@ -36,25 +34,6 @@ public class DrawningMilitaryAircraft : DrawningAircraft
         }
     }
 
-
-    /// <summary>
-    /// Конструктор для DrawningAircraft2
-    /// </summary>
-    /// <param name="speed"></param>
-    /// <param name="weight"></param>
-    /// <param name="bodyColor"></param>
-    /// <param name="additionalColor"></param>
-    /// <param name="pin"></param>
-    /// <param name="rokets"></param>
-    /// <param name="symbolism"></param>
-    public DrawningMilitaryAircraft(EntityAircraft entityAircraft)
-    {
-        if (entityAircraft != null)
-        {
-            EntityAircraft = entityAircraft;
-        }
-    }
-
     public override void DrawTransport(Graphics g)
     {
         if (EntityAircraft is not EntityMilitaryAircraft airCraft || !_startPosX.HasValue || !_startPosY.HasValue)

ProectMilitaryAircraft/ProectMilitaryAircraft/Draw/ExtensionDrawningAircraft.cs

@@ -1,59 +0,0 @@
-using ProectMilitaryAircraft.Entities;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProectMilitaryAircraft.Draw;
-
-/// <summary>
-/// Расширение для класса EntityCar
-/// </summary>
-public static class ExtensionDrawningAircraft
-{
-    /// <summary>
-	/// Разделитель для записи информации по объекту в файл
-	/// </summary>
-	private static readonly string _separatorForObject = ":";
-
-    /// <summary>
-    /// Создание объекта из строки
-    /// </summary>
-    /// <param name="info">Строка с данными для создания объекта</param>
-    /// <returns>Объект</returns>
-    public static DrawningAircraft? CreateDrawningCar(this string info)
-    {
-        string[] strs = info.Split(_separatorForObject);
-        EntityAircraft? aircraft = EntityMilitaryAircraft.CreateEntityMilitaryAircraft(strs);
-        if (aircraft != null)
-        {
-            return new DrawningMilitaryAircraft(aircraft);
-        }
-
-        aircraft = EntityAircraft.CreateEntityAircraft(strs);
-        if (aircraft != null)
-        {
-            return new DrawningAircraft(aircraft);
-        }
-
-        return null;
-    }
-
-    /// <summary>
-    /// Получение данных для сохранения в файл
-    /// </summary>
-    /// <param name="drawningAircraft">Сохраняемый объект</param>
-    /// <returns>Строка с данными по объекту</returns>
-    public static string GetDataForSave(this DrawningAircraft drawningAircraft)
-    {
-        string[]? array = drawningAircraft?.EntityAircraft?.GetStringRepresentation();
-
-        if (array == null)
-        {
-            return string.Empty;
-        }
-
-        return string.Join(_separatorForObject, array);
-    }
-}

ProectMilitaryAircraft/ProectMilitaryAircraft/Entities/EntityAircraft.cs

@@ -45,27 +45,4 @@ public class EntityAircraft
         BodyColor = bodyColor;
 
     }
-    /// <summary>
-	/// Получение строк со значениями свойств объекта класса-сущности
-	/// </summary>
-	/// <returns></returns>
-	public virtual string[] GetStringRepresentation()
-    {
-        return new[] { nameof(EntityAircraft), Speed.ToString(), Weight.ToString(), BodyColor.Name };
-    }
-
-    /// <summary>
-    /// Создание объекта из массива строк
-    /// </summary>
-    /// <param name="strs"></param>
-    /// <returns></returns>
-    public static EntityAircraft? CreateEntityAircraft(string[] strs)
-    {
-        if (strs.Length != 4 || strs[0] != nameof(EntityAircraft))
-        {
-            return null;
-        }
-
-        return new EntityAircraft(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]));
-    }
 }

ProectMilitaryAircraft/ProectMilitaryAircraft/Entities/EntityMilitaryAircraft.cs

@@ -43,27 +43,4 @@ public class EntityMilitaryAircraft : EntityAircraft
         Rokets = rokets;
         Symbolism = symbolism;
     }
-
-    /// <summary>
-    /// Получение строк со значениями свойств объекта класса-сущности
-    /// </summary>
-    /// <returns></returns>
-    public override string[] GetStringRepresentation()
-    {
-        return new[] { nameof(EntityMilitaryAircraft), Speed.ToString(), Weight.ToString(), BodyColor.Name, AdditionalColor.Name, Pin.ToString(), Rokets.ToString(),Symbolism.ToString() };
-    }
-
-    /// <summary>
-	/// Создание объекта из массива строк
-	/// </summary>
-	/// <param name="strs"></param>
-	/// <returns></returns>
-	public static EntityMilitaryAircraft? CreateEntityMilitaryAircraft(string[] strs)
-    {
-        if (strs.Length != 8 || strs[0] != nameof(EntityMilitaryAircraft))
-        {
-            return null;
-        }
-        return new EntityMilitaryAircraft(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]), Color.FromName(strs[4]), Convert.ToBoolean(strs[5]), Convert.ToBoolean(strs[6]), Convert.ToBoolean(strs[7]));
-    }
 }

ProectMilitaryAircraft/ProectMilitaryAircraft/FormAircraftCollection.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(607, 24);
+            groupBoxTools.Location = new Point(607, 0);
             groupBoxTools.Name = "groupBoxTools";
-            groupBoxTools.Size = new Size(194, 560);
+            groupBoxTools.Size = new Size(194, 563);
             groupBoxTools.TabIndex = 0;
             groupBoxTools.TabStop = false;
             groupBoxTools.Text = " Инструменты";
@@ -246,61 +239,19 @@
             // pictureBox
             // 
             pictureBox.Dock = DockStyle.Fill;
-            pictureBox.Location = new Point(0, 24);
+            pictureBox.Location = new Point(0, 0);
             pictureBox.Name = "pictureBox";
-            pictureBox.Size = new Size(607, 560);
+            pictureBox.Size = new Size(607, 563);
             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(801, 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";
-            // 
             // FormAircraftCollection
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(801, 584);
+            ClientSize = new Size(801, 563);
             Controls.Add(pictureBox);
             Controls.Add(groupBoxTools);
-            Controls.Add(menuStrip);
-            MainMenuStrip = menuStrip;
             Name = "FormAircraftCollection";
             Text = "Коллекция самолетов";
             groupBoxTools.ResumeLayout(false);
@@ -309,10 +260,7 @@
             panelStorage.ResumeLayout(false);
             panelStorage.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
-            menuStrip.ResumeLayout(false);
-            menuStrip.PerformLayout();
             ResumeLayout(false);
-            PerformLayout();
         }
 
         #endregion
@@ -335,11 +283,5 @@
         private Button buttonCreateCompany;
         private Button buttonCollectionDel;
         private Panel panelCompanyTools;
-        private MenuStrip menuStrip;
-        private ToolStripMenuItem файлToolStripMenuItem;
-        private ToolStripMenuItem saveToolStripMenuItem;
-        private ToolStripMenuItem loadToolStripMenuItem;
-        private SaveFileDialog saveFileDialog;
-        private OpenFileDialog openFileDialog;
     }
 }

ProectMilitaryAircraft/ProectMilitaryAircraft/FormAircraftCollection.cs

@@ -235,7 +235,7 @@ public partial class FormAircraftCollection : Form
             return;
         }
 
-        ICollectionGenericObjects<DrawningAircraft>? collection = _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
+        ICollectionGenericObjects<DrawningAircraft>? collection = _storageCollection[listBoxCollection.SelectedItem?.ToString()?? string.Empty];
         if (collection == null)
         {
             MessageBox.Show("Коллкция не проиницилизирована");
@@ -253,45 +253,4 @@ public partial class FormAircraftCollection : Form
         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);
-            }
-        }
-    }
 }

ProectMilitaryAircraft/ProectMilitaryAircraft/FormAircraftCollection.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>16, 5</value>
-  </metadata>
-  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>125, 5</value>
-  </metadata>
-  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>260, 5</value>
-  </metadata>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>48</value>
-  </metadata>
 </root>