ProjectAirFighter/ProjectAirFighter/AirCraftDelegate.cs

@@ -1,9 +0,0 @@
-using ProjectAirFighter.Drawnings;
-
-namespace ProjectAirFighter;
-
-/// <summary>
-/// Делегат передачи объекта класса-прорисовки
-/// </summary>
-/// <param name="aircraft"></param>
-public delegate void AirCraftDelegate(DrawningAirCraft aircraft);

ProjectAirFighter/ProjectAirFighter/CollectionGenericObjects/AbstractCompany.cs

@@ -35,7 +35,7 @@ public abstract class AbstractCompany
     /// <summary>
     /// Вычисление максимального количества элементов, который можно разместить в окне
     /// </summary>
-    private int GetMaxCount => _pictureWidth * _pictureHeight / (_placeSizeWidth * _placeSizeHeight);
+    private int GetMaxCount => (_pictureWidth / _placeSizeWidth) * (_pictureHeight / _placeSizeHeight);
 
     /// <summary>
     /// Конструктор
@@ -48,7 +48,7 @@ public abstract class AbstractCompany
         _pictureWidth = picWidth;
         _pictureHeight = picHeight;
         _collection = collection;
-        _collection.SetMaxCount = GetMaxCount;
+        _collection.MaxCount = GetMaxCount;
     }
 
     /// <summary>
@@ -113,5 +113,4 @@ public abstract class AbstractCompany
     /// Расстановка объектов
     /// </summary>
     protected abstract void SetObjectsPosition();
-}
-
+}

ProjectAirFighter/ProjectAirFighter/CollectionGenericObjects/AirCraftAngar.cs

@@ -44,21 +44,19 @@ public class AirCraftAngar : AbstractCompany
     /// </summary>
     protected override void SetObjectsPosition()
     {
-        int currentIndex = -1;
+        int currentIndex = 0;
         for (int j = pamat_j; j >= 0; j--)
         {
             for (int i = pamat_i; i >= 0; i--)
             {
-                currentIndex++;
-                if (_collection?.Get(currentIndex) == null) continue;
+                if (_collection?.Get(currentIndex) != null)
+                {
+                    _collection.Get(currentIndex)?.SetPictureSize(_pictureWidth, _pictureHeight);
+                    _collection.Get(currentIndex)?.SetPosition(i * _placeSizeWidth + 5, j * _placeSizeHeight + 5);
 
-                _collection.Get(currentIndex)?.SetPictureSize(_pictureWidth, _pictureHeight);
-                _collection.Get(currentIndex)?.SetPosition(i * _placeSizeWidth + 5, j * _placeSizeHeight + 5);
+                    currentIndex++;
+                }
             }
         }
     }
-}
-
-
-
-
+}

ProjectAirFighter/ProjectAirFighter/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -19,7 +19,7 @@ public interface ICollectionGenericObjects<T>
     /// <summary>
     /// Установка максимального количества элементов
     /// </summary>
-    int SetMaxCount { set; }
+    int MaxCount { get; set; }
 
     /// <summary>
     /// Добавление объекта в коллекцию
@@ -49,5 +49,16 @@ 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();
 }
 

ProjectAirFighter/ProjectAirFighter/CollectionGenericObjects/ListGenericObjects.cs

@@ -1,4 +1,5 @@
-namespace ProjectAirFighter.CollectionGenericObjects;
+
+namespace ProjectAirFighter.CollectionGenericObjects;
 /// <summary>
 /// Параметризованный набор объектов
 /// </summary>
@@ -15,7 +16,23 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
     /// </summary>
     private int _maxCount;
     public int Count => _collection.Count;
-    public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } }
+    public int MaxCount
+    {
+        get
+        {
+            return _collection.Count;
+        }
+        set
+        {
+            if (value > 0)
+            {
+                _maxCount = value;
+            }
+        }
+    }
+
+    public CollectionType GetCollectionType => CollectionType.List;
+
     /// <summary>
     /// Конструктор
     /// </summary>
@@ -48,5 +65,13 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
         _collection.RemoveAt(position);
         return temp;
     }
+
+    public IEnumerable<T?> GetItems()
+    {
+        for (int i = 0; i < _collection.Count; ++i)
+        {
+            yield return _collection[i];
+        }
+    }
 }
 

ProjectAirFighter/ProjectAirFighter/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -1,4 +1,5 @@
-namespace ProjectAirFighter.CollectionGenericObjects;
+
+namespace ProjectAirFighter.CollectionGenericObjects;
 
 /// <summary>
 /// Параметризованный набор объектов
@@ -14,8 +15,12 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
 
     public int Count => _collection.Length;
 
-    public int SetMaxCount
+    public int MaxCount
     {
+        get
+        {
+            return _collection.Length;
+        }
         set
         {
             if (value > 0)
@@ -32,6 +37,8 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
         }
     }
 
+    public CollectionType GetCollectionType => CollectionType.Massive;
+
     /// <summary>
     /// Конструктор
     /// </summary>
@@ -113,4 +120,12 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
         _collection[position] = null;
         return temp;
     }
+
+    public IEnumerable<T?> GetItems()
+    {
+        for (int i = 0; i < _collection.Length; ++i)
+        {
+            yield return _collection[i];
+        }
+    }
 }

ProjectAirFighter/ProjectAirFighter/CollectionGenericObjects/StorageCollection.cs

@@ -1,11 +1,14 @@
-namespace ProjectAirFighter.CollectionGenericObjects;
+using ProjectAirFighter.Drawnings;
+using System.Text;
+
+namespace ProjectAirFighter.CollectionGenericObjects;
 
 /// <summary>
 /// Класс-хранилище коллекций
 /// </summary>
 /// <typeparam name="T"></typeparam>
 public class StorageCollection<T>
-    where T : class
+    where T : DrawningAirCraft
 {
     /// <summary>
     /// Словарь (хранилище) с коллекциями
@@ -17,6 +20,21 @@ public class StorageCollection<T>
     /// </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>
@@ -65,5 +83,130 @@ 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);
+        }
+
+        using (StreamWriter writer = new StreamWriter(filename))
+        {
+            writer.Write(_collectionKey);
+            foreach (KeyValuePair<string, ICollectionGenericObjects<T>> value in _storages)
+            {
+                StringBuilder sb = new();
+                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);
+                }
+                writer.Write(sb);
+            }
+
+        }
+        return true;
+    }
+
+    /// <summary>
+    /// Загрузка информации по самолётам в хранилище из файла
+    /// </summary>
+    /// <param name="filename">Путь и имя файла</param>
+    /// <returns>true - загрузка прошла успешно, false - ошибка при загрузке данных</returns>
+    public bool LoadData(string filename)
+    {
+        if (!File.Exists(filename))
+        {
+            return false;
+        }
+
+        using (StreamReader fs = File.OpenText(filename))
+        {
+            string str = fs.ReadLine();
+            if (str == null || str.Length == 0)
+            {
+                return false;
+            }
+            if (!str.StartsWith(_collectionKey))
+            {
+                return false;
+            }
+            _storages.Clear();
+            string strs = "";
+            while ((strs = fs.ReadLine()) != null)
+            {
+                string[] record = strs.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?.CreateDrawningAirCraft() is T aircraft)
+                    {
+                        if (collection.Insert(aircraft) == -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,
+        };
+    }
 }
 

ProjectAirFighter/ProjectAirFighter/Drawnings/DrawningAirCraft.cs

@@ -94,6 +94,15 @@ public class DrawningAirCraft
         _drawningAirFighterHeight = drawningAirFighterHeight;
     }
 
+    /// <summary>
+    /// Конструктор для Extention
+    /// </summary>
+    /// <param name="airplan"></param>
+    public DrawningAirCraft(EntityAirCraft aircraft) : this()
+    {
+        EntityAirCraft = new EntityAirCraft(aircraft.Speed, aircraft.Weight, aircraft.BodyColor);
+    }
+
     /// <summary>
     /// Установка границ поля
     /// </summary>

ProjectAirFighter/ProjectAirFighter/Drawnings/DrawningAirFighter.cs

@@ -21,6 +21,14 @@ public class DrawningAirFighter : DrawningAirCraft
         EntityAirCraft = new EntityAirFighter(speed, weight, bodyColor, additionalColor, pgo, rockets);
     }
 
+    /// <summary>
+    /// Конструктор для Extention
+    /// </summary>
+    /// <param name="airbus"></param>
+    public DrawningAirFighter(EntityAirFighter aircraft) : base(66, 74)
+    {
+        EntityAirCraft = new EntityAirFighter(aircraft.Speed, aircraft.Weight, aircraft.BodyColor, aircraft.AdditionalColor, aircraft.Pgo, aircraft.Rockets);
+    }
     public override void DrawTransport(Graphics g)
     {
         if (EntityAirCraft == null || EntityAirCraft is not EntityAirFighter airFighter || !_startPosX.HasValue || !_startPosY.HasValue)

ProjectAirFighter/ProjectAirFighter/Drawnings/ExtentionDrawningAirCraft.cs

@@ -0,0 +1,54 @@
+using ProjectAirFighter.Entities;
+
+namespace ProjectAirFighter.Drawnings;
+
+/// <summary>
+/// Расширение для класса EntityAirCraft
+/// </summary>
+public static class ExtentionDrawningAirCraft
+{
+    /// <summary>
+    /// Разделитель для записи информации по объекту в файл
+    /// </summary>
+    private static readonly string _separatorForObject = ":";
+
+    /// <summary>
+    /// Создание объекта из строки
+    /// </summary>
+    /// <param name="info">Строка с данными для создания объекта</param>
+    /// <returns>Объект</returns>
+    public static DrawningAirCraft? CreateDrawningAirCraft(this string info)
+    {
+        string[] strs = info.Split(_separatorForObject);
+        EntityAirCraft? aircraft = EntityAirFighter.CreateEntityAirFighter(strs);
+        if (aircraft != null)
+        {
+            return new DrawningAirFighter((EntityAirFighter)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);
+    }
+}

ProjectAirFighter/ProjectAirFighter/Entities/EntityAirCraft.cs

@@ -39,4 +39,28 @@ public class EntityAirCraft
         Weight = weight;
         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]));
+    }
 }

ProjectAirFighter/ProjectAirFighter/Entities/EntityAirFighter.cs

@@ -39,4 +39,28 @@ public class EntityAirFighter : EntityAirCraft
         Rockets = rockets;
     }
 
+    /// <summary>
+    /// Получение строк со значениями свойств продвинутого объекта класса-сущности
+    /// </summary>
+    /// <returns></returns>
+    public override string[] GetStringRepresentation()
+    {
+        return new[] { nameof(EntityAirFighter), Speed.ToString(), Weight.ToString(), BodyColor.Name, AdditionalColor.Name,
+                        Pgo.ToString(), Rockets.ToString()};
+    }
+
+    /// <summary>
+    /// Создание продвинутого объекта из массива строк
+    /// </summary>
+    /// <param name="strs"></param>
+    /// <returns></returns>
+    public static EntityAirFighter? CreateEntityAirFighter(string[] strs)
+    {
+        if (strs.Length != 7 || strs[0] != nameof(EntityAirFighter))
+        {
+            return null;
+        }
+        return new EntityAirFighter(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]),
+                                    Color.FromName(strs[4]), Convert.ToBoolean(strs[5]), Convert.ToBoolean(strs[6]));
+    }
 }

ProjectAirFighter/ProjectAirFighter/FormAirCraftCollection.Designer.cs

@@ -38,34 +38,37 @@
             radioButtonMassive = new RadioButton();
             textBoxCollectionName = new TextBox();
             labelCollectionName = new Label();
-            buttonRefresh = new Button();
-            buttonGoToCheck = new Button();
-            buttonRemoveAirCraft = new Button();
-            maskedTextBoxPosition = new MaskedTextBox();
-            buttonAddAirCraft = new Button();
             comboBoxSelectorCompany = new ComboBox();
             panelCompanyTools = new Panel();
+            buttonAddAirCraft = new Button();
+            maskedTextBoxPosition = new MaskedTextBox();
+            buttonRefresh = new Button();
+            buttonRemoveAirCraft = new Button();
+            buttonGoToCheck = new Button();
             pictureBox = new PictureBox();
+            menuStrip = new MenuStrip();
+            файлToolStripMenuItem = new ToolStripMenuItem();
+            saveToolStripMenuItem = new ToolStripMenuItem();
+            loadToolStripMenuItem = new ToolStripMenuItem();
+            saveFileDialog = new SaveFileDialog();
+            openFileDialog = new OpenFileDialog();
             groupBoxTools.SuspendLayout();
             panelStorage.SuspendLayout();
             panelCompanyTools.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
+            menuStrip.SuspendLayout();
             SuspendLayout();
             // 
             // groupBoxTools
             // 
             groupBoxTools.Controls.Add(buttonCreateCompany);
             groupBoxTools.Controls.Add(panelStorage);
-            groupBoxTools.Controls.Add(buttonRefresh);
-            groupBoxTools.Controls.Add(buttonGoToCheck);
-            groupBoxTools.Controls.Add(buttonRemoveAirCraft);
-            groupBoxTools.Controls.Add(maskedTextBoxPosition);
             groupBoxTools.Controls.Add(comboBoxSelectorCompany);
             groupBoxTools.Controls.Add(panelCompanyTools);
             groupBoxTools.Dock = DockStyle.Right;
-            groupBoxTools.Location = new Point(828, 0);
+            groupBoxTools.Location = new Point(828, 28);
             groupBoxTools.Name = "groupBoxTools";
-            groupBoxTools.Size = new Size(215, 622);
+            groupBoxTools.Size = new Size(215, 594);
             groupBoxTools.TabIndex = 0;
             groupBoxTools.TabStop = false;
             groupBoxTools.Text = "Инструменты";
@@ -163,59 +166,6 @@
             labelCollectionName.TabIndex = 0;
             labelCollectionName.Text = "Название коллекции:";
             // 
-            // buttonRefresh
-            // 
-            buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRefresh.Location = new Point(17, 585);
-            buttonRefresh.Name = "buttonRefresh";
-            buttonRefresh.Size = new Size(186, 31);
-            buttonRefresh.TabIndex = 6;
-            buttonRefresh.Text = "Обновить";
-            buttonRefresh.UseVisualStyleBackColor = true;
-            buttonRefresh.Click += ButtonRefresh_Click;
-            // 
-            // buttonGoToCheck
-            // 
-            buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonGoToCheck.Location = new Point(17, 544);
-            buttonGoToCheck.Name = "buttonGoToCheck";
-            buttonGoToCheck.Size = new Size(186, 35);
-            buttonGoToCheck.TabIndex = 5;
-            buttonGoToCheck.Text = "Передать на тесты";
-            buttonGoToCheck.UseVisualStyleBackColor = true;
-            buttonGoToCheck.Click += ButtonGoToCheck_Click;
-            // 
-            // buttonRemoveAirCraft
-            // 
-            buttonRemoveAirCraft.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRemoveAirCraft.Location = new Point(17, 500);
-            buttonRemoveAirCraft.Name = "buttonRemoveAirCraft";
-            buttonRemoveAirCraft.Size = new Size(186, 38);
-            buttonRemoveAirCraft.TabIndex = 4;
-            buttonRemoveAirCraft.Text = "Удаление самолёта";
-            buttonRemoveAirCraft.UseVisualStyleBackColor = true;
-            buttonRemoveAirCraft.Click += ButtonRemoveAirCraft_Click;
-            // 
-            // maskedTextBoxPosition
-            // 
-            maskedTextBoxPosition.Location = new Point(17, 467);
-            maskedTextBoxPosition.Mask = "00";
-            maskedTextBoxPosition.Name = "maskedTextBoxPosition";
-            maskedTextBoxPosition.Size = new Size(186, 27);
-            maskedTextBoxPosition.TabIndex = 3;
-            maskedTextBoxPosition.ValidatingType = typeof(int);
-            // 
-            // buttonAddAirCraft
-            // 
-            buttonAddAirCraft.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonAddAirCraft.Location = new Point(11, 21);
-            buttonAddAirCraft.Name = "buttonAddAirCraft";
-            buttonAddAirCraft.Size = new Size(186, 49);
-            buttonAddAirCraft.TabIndex = 1;
-            buttonAddAirCraft.Text = "Добавление военного самолёта";
-            buttonAddAirCraft.UseVisualStyleBackColor = true;
-            buttonAddAirCraft.Click += ButtonAddAirCraft_Click;
-            // 
             // comboBoxSelectorCompany
             // 
             comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
@@ -231,21 +181,119 @@
             // panelCompanyTools
             // 
             panelCompanyTools.Controls.Add(buttonAddAirCraft);
+            panelCompanyTools.Controls.Add(maskedTextBoxPosition);
+            panelCompanyTools.Controls.Add(buttonRefresh);
+            panelCompanyTools.Controls.Add(buttonRemoveAirCraft);
+            panelCompanyTools.Controls.Add(buttonGoToCheck);
             panelCompanyTools.Enabled = false;
             panelCompanyTools.Location = new Point(6, 352);
             panelCompanyTools.Name = "panelCompanyTools";
             panelCompanyTools.Size = new Size(203, 270);
             panelCompanyTools.TabIndex = 9;
             // 
+            // buttonAddAirCraft
+            // 
+            buttonAddAirCraft.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddAirCraft.Location = new Point(11, 21);
+            buttonAddAirCraft.Name = "buttonAddAirCraft";
+            buttonAddAirCraft.Size = new Size(186, 49);
+            buttonAddAirCraft.TabIndex = 1;
+            buttonAddAirCraft.Text = "Добавление военного самолёта";
+            buttonAddAirCraft.UseVisualStyleBackColor = true;
+            buttonAddAirCraft.Click += ButtonAddAirCraft_Click;
+            // 
+            // maskedTextBoxPosition
+            // 
+            maskedTextBoxPosition.Location = new Point(11, 85);
+            maskedTextBoxPosition.Mask = "00";
+            maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            maskedTextBoxPosition.Size = new Size(186, 27);
+            maskedTextBoxPosition.TabIndex = 3;
+            maskedTextBoxPosition.ValidatingType = typeof(int);
+            // 
+            // buttonRefresh
+            // 
+            buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRefresh.Location = new Point(11, 203);
+            buttonRefresh.Name = "buttonRefresh";
+            buttonRefresh.Size = new Size(186, 31);
+            buttonRefresh.TabIndex = 6;
+            buttonRefresh.Text = "Обновить";
+            buttonRefresh.UseVisualStyleBackColor = true;
+            buttonRefresh.Click += ButtonRefresh_Click;
+            // 
+            // buttonRemoveAirCraft
+            // 
+            buttonRemoveAirCraft.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRemoveAirCraft.Location = new Point(11, 118);
+            buttonRemoveAirCraft.Name = "buttonRemoveAirCraft";
+            buttonRemoveAirCraft.Size = new Size(186, 38);
+            buttonRemoveAirCraft.TabIndex = 4;
+            buttonRemoveAirCraft.Text = "Удаление самолёта";
+            buttonRemoveAirCraft.UseVisualStyleBackColor = true;
+            buttonRemoveAirCraft.Click += ButtonRemoveAirCraft_Click;
+            // 
+            // buttonGoToCheck
+            // 
+            buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonGoToCheck.Location = new Point(11, 162);
+            buttonGoToCheck.Name = "buttonGoToCheck";
+            buttonGoToCheck.Size = new Size(186, 35);
+            buttonGoToCheck.TabIndex = 5;
+            buttonGoToCheck.Text = "Передать на тесты";
+            buttonGoToCheck.UseVisualStyleBackColor = true;
+            buttonGoToCheck.Click += ButtonGoToCheck_Click;
+            // 
             // pictureBox
             // 
             pictureBox.Dock = DockStyle.Fill;
-            pictureBox.Location = new Point(0, 0);
+            pictureBox.Location = new Point(0, 28);
             pictureBox.Name = "pictureBox";
-            pictureBox.Size = new Size(828, 622);
+            pictureBox.Size = new Size(828, 594);
             pictureBox.TabIndex = 1;
             pictureBox.TabStop = false;
             // 
+            // menuStrip
+            // 
+            menuStrip.ImageScalingSize = new Size(20, 20);
+            menuStrip.Items.AddRange(new ToolStripItem[] { файлToolStripMenuItem });
+            menuStrip.Location = new Point(0, 0);
+            menuStrip.Name = "menuStrip";
+            menuStrip.Size = new Size(1043, 28);
+            menuStrip.TabIndex = 2;
+            menuStrip.Text = "menuStrip";
+            // 
+            // файлToolStripMenuItem
+            // 
+            файлToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { saveToolStripMenuItem, loadToolStripMenuItem });
+            файлToolStripMenuItem.Name = "файлToolStripMenuItem";
+            файлToolStripMenuItem.Size = new Size(59, 24);
+            файлToolStripMenuItem.Text = "Файл";
+            // 
+            // saveToolStripMenuItem
+            // 
+            saveToolStripMenuItem.Name = "saveToolStripMenuItem";
+            saveToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.S;
+            saveToolStripMenuItem.Size = new Size(227, 26);
+            saveToolStripMenuItem.Text = "Сохранение";
+            saveToolStripMenuItem.Click += SaveToolStripMenuItem_Click;
+            // 
+            // loadToolStripMenuItem
+            // 
+            loadToolStripMenuItem.Name = "loadToolStripMenuItem";
+            loadToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.L;
+            loadToolStripMenuItem.Size = new Size(227, 26);
+            loadToolStripMenuItem.Text = "Загрузка";
+            loadToolStripMenuItem.Click += LoadToolStripMenuItem_Click;
+            // 
+            // saveFileDialog
+            // 
+            saveFileDialog.Filter = "txt file|*.txt";
+            // 
+            // openFileDialog
+            // 
+            openFileDialog.Filter = "txt file|*.txt";
+            // 
             // FormAirCraftCollection
             // 
             AutoScaleDimensions = new SizeF(8F, 20F);
@@ -253,15 +301,20 @@
             ClientSize = new Size(1043, 622);
             Controls.Add(pictureBox);
             Controls.Add(groupBoxTools);
+            Controls.Add(menuStrip);
+            MainMenuStrip = menuStrip;
             Name = "FormAirCraftCollection";
             Text = "Коллекция самолётов";
             groupBoxTools.ResumeLayout(false);
-            groupBoxTools.PerformLayout();
             panelStorage.ResumeLayout(false);
             panelStorage.PerformLayout();
             panelCompanyTools.ResumeLayout(false);
+            panelCompanyTools.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
+            menuStrip.ResumeLayout(false);
+            menuStrip.PerformLayout();
             ResumeLayout(false);
+            PerformLayout();
         }
 
         #endregion
@@ -284,5 +337,11 @@
         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;
     }
 }

ProjectAirFighter/ProjectAirFighter/FormAirCraftCollection.cs

@@ -12,7 +12,7 @@ public partial class FormAirCraftCollection : Form
     /// Хранилише коллекций
     /// </summary>
     private readonly StorageCollection<DrawningAirCraft> _storageCollection;
-    
+
     /// <summary>
     /// Компания
     /// </summary>
@@ -53,7 +53,8 @@ public partial class FormAirCraftCollection : Form
 	/// Добавление самолёта в коллекцию
 	/// </summary>
 	/// <param name="aircraft"></param>
-    private void SetAirCraft(DrawningAirCraft? aircraft) {
+    private void SetAirCraft(DrawningAirCraft? aircraft)
+    {
         if (_company == null || aircraft == null)
         {
             return;
@@ -243,4 +244,47 @@ public partial class FormAirCraftCollection : Form
         panelCompanyTools.Enabled = true;
         RerfreshListBoxItems();
     }
+
+    /// <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);
+                RerfreshListBoxItems();
+            }
+            else
+            {
+                MessageBox.Show("Не сохранилось", "Результат",
+                MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+    }
 }

ProjectAirFighter/ProjectAirFighter/FormAirCraftCollection.resx

@@ -117,4 +117,13 @@
   <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>145, 17</value>
+  </metadata>
+  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>310, 17</value>
+  </metadata>
 </root>