сплошная ошибка

AirFighter/AirFighter/CollectionGenericObjects/AbstractCompany.cs

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

AirFighter/AirFighter/CollectionGenericObjects/ICollectionGenericObjects.cs

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

AirFighter/AirFighter/CollectionGenericObjects/ListGenericObjects.cs

@@ -19,7 +19,19 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
 
     public int Count => _collection.Count;
 
-    public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } }
+    public int MaxCount
+    {
+        get => _maxCount;
+        set
+        {
+            if (value > 0)
+            {
+                _maxCount = value;
+            }
+        }
+    }
+
+    public CollectionType GetCollectionType => CollectionType.List;
 
     /// <summary>
     /// Конструктор
@@ -57,4 +69,12 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
         _collection.RemoveAt(position);
         return pos;
     }
+
+    public IEnumerable<T?> GetItems()
+    {
+        for (int i = 0; i < _collection.Count; ++i)
+        {
+            yield return _collection[i];
+        }
+    }
 }

AirFighter/AirFighter/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -14,8 +14,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 +36,8 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
         }
     }
 
+    public CollectionType GetCollectionType => CollectionType.Massive;
+
     /// <summary>
     /// Конструктор
     /// </summary>
@@ -105,4 +111,12 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
         _collection[position] = null;
         return obj;
     }
+
+    public IEnumerable<T?> GetItems()
+    {
+        for (int i = 0; i < _collection.Length; ++i)
+        {
+            yield return _collection[i];
+        }
+    }
 }

AirFighter/AirFighter/CollectionGenericObjects/StorageCollection.cs

@@ -1,11 +1,15 @@
-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 : DrawningMilitaryAircraft
+
 {
     /// <summary>
     /// Словарь (хранилище) с коллекциями
@@ -17,12 +21,26 @@ public class StorageCollection<T>
     /// </summary>
     public List<string> Keys => _storages.Keys.ToList();
 
+    /// Ключевое слово, с которого должен начинаться файл
+    /// </summary>
+    private readonly string _collectionKey = "CollectionsStorage";
+
+    /// <summary>
+    /// Разделитель для записи ключа и значения элемента словаря
+    /// </summary>
+    private readonly string _separatorForKeyValue = "|";
+
+    /// <summary>
+    /// Разделитель для записей коллекции данных в файл
+    /// </summary>
+    private readonly string _separatorItems = ";";
+
     /// <summary>
     /// Конструктор
     /// </summary>
     public StorageCollection()
     {
-        _storages = new Dictionary<string, ICollectionGenericObjects<T>>(); //вот тут какое-то свойство 
+        _storages = new Dictionary<string, ICollectionGenericObjects<T>>();
     }
 
     /// <summary>
@@ -70,4 +88,147 @@ public class StorageCollection<T>
             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);
+        }
+
+        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?.CreateDrawningMilitaryAircraft() is T militaryAircraft)
+                    {
+                        if (collection.Insert(militaryAircraft) == -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,
+        };
+    }
 }

AirFighter/AirFighter/FormMilitaryAircraftCollection.Designer.cs

@@ -29,6 +29,12 @@
         private void InitializeComponent()
         {
             groupBoxTools = new GroupBox();
+            panelCompanyTools = new Panel();
+            buttonRefresh = new Button();
+            buttonGoToCheck = new Button();
+            buttonRemoveMilitaryAircraft = new Button();
+            buttonAddMilitaryAircraft = new Button();
+            maskedTextBoxPosition = new MaskedTextBox();
             buttonCreateCompany = new Button();
             panelStorage = new Panel();
             buttonCollectionDel = new Button();
@@ -38,19 +44,12 @@
             radioButtonMassive = new RadioButton();
             radioButtonList = new RadioButton();
             labelCollectionName = new Label();
-            buttonRefresh = new Button();
-            buttonGoToCheck = new Button();
-            buttonRemoveMilitaryAircraft = new Button();
-            maskedTextBoxPosition = new MaskedTextBox();
-            buttonAddAirFighter = new Button();
-            buttonAddMilitaryAircraft = new Button();
             comboBoxSelectorCompany = new ComboBox();
             pictureBox = new PictureBox();
-            panelCompanyTools = new Panel();
             groupBoxTools.SuspendLayout();
+            panelCompanyTools.SuspendLayout();
             panelStorage.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
-            panelCompanyTools.SuspendLayout();
             SuspendLayout();
             // 
             // groupBoxTools
@@ -67,6 +66,74 @@
             groupBoxTools.TabStop = false;
             groupBoxTools.Text = "Инструменты";
             // 
+            // panelCompanyTools
+            // 
+            panelCompanyTools.Controls.Add(buttonRefresh);
+            panelCompanyTools.Controls.Add(buttonGoToCheck);
+            panelCompanyTools.Controls.Add(buttonRemoveMilitaryAircraft);
+            panelCompanyTools.Controls.Add(buttonAddMilitaryAircraft);
+            panelCompanyTools.Controls.Add(maskedTextBoxPosition);
+            panelCompanyTools.Dock = DockStyle.Bottom;
+            panelCompanyTools.Enabled = false;
+            panelCompanyTools.Location = new Point(3, 357);
+            panelCompanyTools.Name = "panelCompanyTools";
+            panelCompanyTools.Size = new Size(200, 307);
+            panelCompanyTools.TabIndex = 10;
+            // 
+            // buttonRefresh
+            // 
+            buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRefresh.Location = new Point(3, 252);
+            buttonRefresh.Name = "buttonRefresh";
+            buttonRefresh.Size = new Size(192, 49);
+            buttonRefresh.TabIndex = 7;
+            buttonRefresh.Text = "Обновить";
+            buttonRefresh.UseVisualStyleBackColor = true;
+            buttonRefresh.Click += buttonRefresh_Click;
+            // 
+            // buttonGoToCheck
+            // 
+            buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonGoToCheck.Location = new Point(3, 197);
+            buttonGoToCheck.Name = "buttonGoToCheck";
+            buttonGoToCheck.Size = new Size(192, 49);
+            buttonGoToCheck.TabIndex = 6;
+            buttonGoToCheck.Text = "Передать на тесты";
+            buttonGoToCheck.UseVisualStyleBackColor = true;
+            buttonGoToCheck.Click += buttonGoToCheck_Click;
+            // 
+            // buttonRemoveMilitaryAircraft
+            // 
+            buttonRemoveMilitaryAircraft.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRemoveMilitaryAircraft.Location = new Point(4, 142);
+            buttonRemoveMilitaryAircraft.Name = "buttonRemoveMilitaryAircraft";
+            buttonRemoveMilitaryAircraft.Size = new Size(191, 49);
+            buttonRemoveMilitaryAircraft.TabIndex = 5;
+            buttonRemoveMilitaryAircraft.Text = "Удаление военного самолёта";
+            buttonRemoveMilitaryAircraft.UseVisualStyleBackColor = true;
+            buttonRemoveMilitaryAircraft.Click += buttonRemoveMilitaryAircraft_Click;
+            // 
+            // buttonAddMilitaryAircraft
+            // 
+            buttonAddMilitaryAircraft.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddMilitaryAircraft.Location = new Point(4, 3);
+            buttonAddMilitaryAircraft.Name = "buttonAddMilitaryAircraft";
+            buttonAddMilitaryAircraft.Size = new Size(191, 49);
+            buttonAddMilitaryAircraft.TabIndex = 1;
+            buttonAddMilitaryAircraft.Text = "Добавление военного самолёта";
+            buttonAddMilitaryAircraft.UseVisualStyleBackColor = true;
+            buttonAddMilitaryAircraft.Click += buttonAddMilitaryAircraft_Click;
+            // 
+            // maskedTextBoxPosition
+            // 
+            maskedTextBoxPosition.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            maskedTextBoxPosition.Location = new Point(3, 109);
+            maskedTextBoxPosition.Mask = "00";
+            maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            maskedTextBoxPosition.Size = new Size(192, 27);
+            maskedTextBoxPosition.TabIndex = 4;
+            maskedTextBoxPosition.ValidatingType = typeof(int);
+            // 
             // buttonCreateCompany
             // 
             buttonCreateCompany.Location = new Point(7, 322);
@@ -159,70 +226,6 @@
             labelCollectionName.TabIndex = 0;
             labelCollectionName.Text = "Название коллекции:";
             // 
-            // buttonRefresh
-            // 
-            buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRefresh.Location = new Point(3, 252);
-            buttonRefresh.Name = "buttonRefresh";
-            buttonRefresh.Size = new Size(192, 49);
-            buttonRefresh.TabIndex = 7;
-            buttonRefresh.Text = "Обновить";
-            buttonRefresh.UseVisualStyleBackColor = true;
-            buttonRefresh.Click += buttonRefresh_Click;
-            // 
-            // buttonGoToCheck
-            // 
-            buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonGoToCheck.Location = new Point(3, 197);
-            buttonGoToCheck.Name = "buttonGoToCheck";
-            buttonGoToCheck.Size = new Size(192, 49);
-            buttonGoToCheck.TabIndex = 6;
-            buttonGoToCheck.Text = "Передать на тесты";
-            buttonGoToCheck.UseVisualStyleBackColor = true;
-            buttonGoToCheck.Click += buttonGoToCheck_Click;
-            // 
-            // buttonRemoveMilitaryAircraft
-            // 
-            buttonRemoveMilitaryAircraft.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRemoveMilitaryAircraft.Location = new Point(4, 142);
-            buttonRemoveMilitaryAircraft.Name = "buttonRemoveMilitaryAircraft";
-            buttonRemoveMilitaryAircraft.Size = new Size(191, 49);
-            buttonRemoveMilitaryAircraft.TabIndex = 5;
-            buttonRemoveMilitaryAircraft.Text = "Удаление военного самолёта";
-            buttonRemoveMilitaryAircraft.UseVisualStyleBackColor = true;
-            buttonRemoveMilitaryAircraft.Click += buttonRemoveMilitaryAircraft_Click;
-            // 
-            // maskedTextBoxPosition
-            // 
-            maskedTextBoxPosition.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            maskedTextBoxPosition.Location = new Point(3, 109);
-            maskedTextBoxPosition.Mask = "00";
-            maskedTextBoxPosition.Name = "maskedTextBoxPosition";
-            maskedTextBoxPosition.Size = new Size(192, 27);
-            maskedTextBoxPosition.TabIndex = 4;
-            maskedTextBoxPosition.ValidatingType = typeof(int);
-            // 
-            // buttonAddAirFighter
-            // 
-            buttonAddAirFighter.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonAddAirFighter.Location = new Point(3, 54);
-            buttonAddAirFighter.Name = "buttonAddAirFighter";
-            buttonAddAirFighter.Size = new Size(192, 49);
-            buttonAddAirFighter.TabIndex = 2;
-            buttonAddAirFighter.Text = "Добавление истребителя";
-            buttonAddAirFighter.UseVisualStyleBackColor = true;
-            // 
-            // buttonAddMilitaryAircraft
-            // 
-            buttonAddMilitaryAircraft.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonAddMilitaryAircraft.Location = new Point(4, 3);
-            buttonAddMilitaryAircraft.Name = "buttonAddMilitaryAircraft";
-            buttonAddMilitaryAircraft.Size = new Size(191, 49);
-            buttonAddMilitaryAircraft.TabIndex = 1;
-            buttonAddMilitaryAircraft.Text = "Добавление военного самолёта";
-            buttonAddMilitaryAircraft.UseVisualStyleBackColor = true;
-            buttonAddMilitaryAircraft.Click += buttonAddMilitaryAircraft_Click;
-            // 
             // comboBoxSelectorCompany
             // 
             comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
@@ -244,21 +247,6 @@
             pictureBox.TabIndex = 3;
             pictureBox.TabStop = false;
             // 
-            // panelCompanyTools
-            // 
-            panelCompanyTools.Controls.Add(buttonRefresh);
-            panelCompanyTools.Controls.Add(buttonGoToCheck);
-            panelCompanyTools.Controls.Add(buttonRemoveMilitaryAircraft);
-            panelCompanyTools.Controls.Add(buttonAddMilitaryAircraft);
-            panelCompanyTools.Controls.Add(buttonAddAirFighter);
-            panelCompanyTools.Controls.Add(maskedTextBoxPosition);
-            panelCompanyTools.Dock = DockStyle.Bottom;
-            panelCompanyTools.Enabled = false;
-            panelCompanyTools.Location = new Point(3, 357);
-            panelCompanyTools.Name = "panelCompanyTools";
-            panelCompanyTools.Size = new Size(200, 307);
-            panelCompanyTools.TabIndex = 10;
-            // 
             // FormMilitaryAircraftCollection
             // 
             AutoScaleDimensions = new SizeF(8F, 20F);
@@ -269,11 +257,11 @@
             Name = "FormMilitaryAircraftCollection";
             Text = "Коллекция военных самолётов";
             groupBoxTools.ResumeLayout(false);
+            panelCompanyTools.ResumeLayout(false);
+            panelCompanyTools.PerformLayout();
             panelStorage.ResumeLayout(false);
             panelStorage.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
-            panelCompanyTools.ResumeLayout(false);
-            panelCompanyTools.PerformLayout();
             ResumeLayout(false);
         }
 
@@ -281,7 +269,6 @@
 
         private GroupBox groupBoxTools;
         private ComboBox comboBoxSelectorCompany;
-        private Button buttonAddAirFighter;
         private Button buttonAddMilitaryAircraft;
         private MaskedTextBox maskedTextBoxPosition;
         private PictureBox pictureBox;

AirFighter/AirFighter/FormMilitaryAircraftCollection.cs

@@ -1,5 +1,6 @@
 using ProjectAirFighter.CollectionGenericObjects;
 using ProjectAirFighter.Drawnings;
+using System.Windows.Forms;
 
 namespace ProjectAirFighter;
 
@@ -226,4 +227,45 @@ public partial class FormMilitaryAircraftCollection : 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);
+            }
+        }
+    }
 }

AirFighter/AirFighter/FormMilitaryAircraftConfig.cs

@@ -41,7 +41,14 @@ public partial class FormMilitaryAircraftConfig : Form
     /// <param name="militaryAircraftDelegate"></param>
     public void AddEvent(Action<DrawningMilitaryAircraft> militaryAircraftDelegate)
     {
-        MilitaryAircraftDelegate += militaryAircraftDelegate;
+        if (MilitaryAircraftDelegate != null)
+        {
+            MilitaryAircraftDelegate = militaryAircraftDelegate;
+        }
+        else
+        {
+            MilitaryAircraftDelegate += militaryAircraftDelegate;
+        }
     }
 
     /// <summary>

AirFighter/AirFighter/MilitaryAircraftDelegate.cs

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