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

AirFighter/AirFighter/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -1,6 +1,4 @@
-using ProjectAirFighter.Drawnings;
+namespace ProjectAirFighter.CollectionGenericObjects;
-
-namespace ProjectAirFighter.CollectionGenericObjects;
 
 /// <summary>
 /// Интерфейс описания действий для набора хранимых объектов
@@ -17,7 +15,7 @@ public interface ICollectionGenericObjects<T>
     /// <summary>
     /// Установка максимального количества элементов
     /// </summary>
-    int MaxCount { get; set; }
+	int MaxCount { get; set; }
 
     /// <summary>
     /// Добавление объекта в коллекцию

AirFighter/AirFighter/CollectionGenericObjects/ListGenericObjects.cs

@@ -21,10 +21,7 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
 
     public int MaxCount
     {
-        get
+        get => _maxCount;
-        {
-            return Count;
-        }
         set
         {
             if (value > 0)

AirFighter/AirFighter/CollectionGenericObjects/StorageCollection.cs

@@ -9,6 +9,7 @@ namespace ProjectAirFighter.CollectionGenericObjects;
 /// <typeparam name="T"></typeparam>
 public class StorageCollection<T>
     where T : DrawningMilitaryAircraft
+
 {
     /// <summary>
     /// Словарь (хранилище) с коллекциями
@@ -39,7 +40,7 @@ public class StorageCollection<T>
     /// </summary>
     public StorageCollection()
     {
-        _storages = new Dictionary<string, ICollectionGenericObjects<T>>(); //вот тут какое-то свойство 
+        _storages = new Dictionary<string, ICollectionGenericObjects<T>>();
     }
 
     /// <summary>
@@ -89,7 +90,7 @@ public class StorageCollection<T>
     }
 
     /// <summary>
-    /// Сохранение информации по военным самолётам в хранилище в файл
+    /// Сохранение информации по автомобилям в хранилище в файл
     /// </summary>
     /// <param name="filename">Путь и имя файла</param>
     /// <returns>true - сохранение прошло успешно, false - ошибка при сохранении данных</returns>
@@ -148,10 +149,12 @@ public class StorageCollection<T>
     }
 
     /// <summary>
-    /// Загрузка информации по военным самолётам в хранилище из файла
+    /// Загрузка информации по автомобилям в хранилище из файла
     /// </summary>
     /// <param name="filename">Путь и имя файла</param>
     /// <returns>true - загрузка прошла успешно, false - ошибка при загрузке данных</returns>
+
+    //
     public bool LoadData(string filename)
     {
         if (!File.Exists(filename))

AirFighter/AirFighter/Drawnings/DrawningAirFighter.cs

@@ -22,22 +22,6 @@ public class DrawningAirFighter : DrawningMilitaryAircraft
         EntityMilitaryAircraft = new EntityAirFighter(speed, weight, bodyColor, additionalColor, wings, rockets);
     }
 
-    /// <summary>
-    /// Конструктор
-    /// </summary>
-    public DrawningAirFighter(EntityAirFighter militaryAircraft) : base(110, 60)
-    {
-        EntityMilitaryAircraft = new EntityAirFighter(militaryAircraft.Speed, militaryAircraft.Weight, militaryAircraft.BodyColor, militaryAircraft.AdditionalColor, militaryAircraft.Wings, militaryAircraft.Rockets);
-    }
-
-    //public DrawningAirFighter(EntityMilitaryAircraft entityMilitaryAircraft) : base(110, 60)
-    //{
-    //    if (entityMilitaryAircraft != null)
-    //    {
-    //        EntityMilitaryAircraft = entityMilitaryAircraft;
-    //    }
-    //}
-
     public override void DrawTransport(Graphics g)
     {
         if (EntityMilitaryAircraft == null || EntityMilitaryAircraft is not EntityAirFighter airFighter || !_startPosX.HasValue || !_startPosY.HasValue)

AirFighter/AirFighter/Drawnings/DrawningMilitaryAircraft.cs

@@ -84,15 +84,6 @@ public class DrawningMilitaryAircraft
         EntityMilitaryAircraft = new EntityMilitaryAircraft(speed, weight, bodyColor);
     }
 
-    /// <summary>
-    /// Конструктор
-    /// </summary>
-    /// <param name="militaryAircraft">Класс-сущность</param>
-    public DrawningMilitaryAircraft(EntityMilitaryAircraft militaryAircraft) : this()
-    {
-        EntityMilitaryAircraft = militaryAircraft;
-    }
-
     /// <summary>
 	/// Конструктор для наследников
 	/// </summary>

AirFighter/AirFighter/Drawnings/ExtentionDrawningMilitaryAircraft.cs

@@ -1,54 +0,0 @@
-using ProjectAirFighter.Entities;
-
-namespace ProjectAirFighter.Drawnings;
-
-/// <summary>
-/// Расширение для класса EntityCar
-/// </summary>
-public static class ExtentionDrawningMilitaryAircraft
-{
-    /// <summary>
-    /// Разделитель для записи информации по объекту в файл
-    /// </summary>
-    private static readonly string _separatorForObject = ":";
-
-    /// <summary>
-    /// Создание объекта из строки
-    /// </summary>
-    /// <param name="info">Строка с данными для создания объекта</param>
-    /// <returns>Объект</returns>
-    public static DrawningMilitaryAircraft? CreateDrawningMilitaryAircraft(this string info)
-    {
-        string[] strs = info.Split(_separatorForObject);
-        EntityMilitaryAircraft? militaryAircraft = EntityAirFighter.CreateEntityAirFighter(strs);
-        if (militaryAircraft != null)
-        {
-            return new DrawningAirFighter((EntityAirFighter)militaryAircraft);
-        }
-
-        militaryAircraft = EntityMilitaryAircraft.CreateEntityMilitaryAircraft(strs);
-        if (militaryAircraft != null)
-        {
-            return new DrawningMilitaryAircraft(militaryAircraft);
-        }
-
-        return null;
-    }
-
-    /// <summary>
-    /// Получение данных для сохранения в файл
-    /// </summary>
-    /// <param name="drawningCar">Сохраняемый объект</param>
-    /// <returns>Строка с данными по объекту</returns>
-    public static string GetDataForSave(this DrawningMilitaryAircraft drawningMilitaryAircraft)
-    {
-        string[]? array = drawningMilitaryAircraft?.EntityMilitaryAircraft?.GetStringRepresentation();
-
-        if (array == null)
-        {
-            return string.Empty;
-        }
-
-        return string.Join(_separatorForObject, array);
-    }
-}

AirFighter/AirFighter/Entities/EntityAirFighter.cs

@@ -22,24 +22,4 @@ public class EntityAirFighter : EntityMilitaryAircraft
         Rockets = rockets;
         Wings = wings;
     }
-
-    public override string[] GetStringRepresentation()
-    {
-        return new[] { nameof(EntityAirFighter), Speed.ToString(), Weight.ToString(), BodyColor.Name, Wings.ToString(), Rockets.ToString(), AdditionalColor.Name };
-    }
-
-    /// <summary>
-    /// Создание объекта из массива строк
-    /// </summary>
-    /// <param name="strs"></param>
-    /// <returns></returns>
-    public static EntityAirFighter? CreateEntityAirFighter(string[] strs)
-    {
-        if (strs.Length != 8 || 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]));
-    }
 }

AirFighter/AirFighter/Entities/EntityMilitaryAircraft.cs

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

AirFighter/AirFighter/FormMilitaryAircraftCollection.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(744, 28);
+            groupBoxTools.Location = new Point(744, 0);
             groupBoxTools.Name = "groupBoxTools";
-            groupBoxTools.Size = new Size(206, 639);
+            groupBoxTools.Size = new Size(206, 667);
             groupBoxTools.TabIndex = 0;
             groupBoxTools.TabStop = false;
             groupBoxTools.Text = "Инструменты";
@@ -84,13 +77,13 @@
             panelCompanyTools.Enabled = false;
             panelCompanyTools.Location = new Point(3, 357);
             panelCompanyTools.Name = "panelCompanyTools";
-            panelCompanyTools.Size = new Size(200, 279);
+            panelCompanyTools.Size = new Size(200, 307);
             panelCompanyTools.TabIndex = 10;
             // 
             // buttonRefresh
             // 
             buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRefresh.Location = new Point(0, 227);
+            buttonRefresh.Location = new Point(3, 252);
             buttonRefresh.Name = "buttonRefresh";
             buttonRefresh.Size = new Size(192, 49);
             buttonRefresh.TabIndex = 7;
@@ -101,7 +94,7 @@
             // buttonGoToCheck
             // 
             buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonGoToCheck.Location = new Point(3, 178);
+            buttonGoToCheck.Location = new Point(3, 197);
             buttonGoToCheck.Name = "buttonGoToCheck";
             buttonGoToCheck.Size = new Size(192, 49);
             buttonGoToCheck.TabIndex = 6;
@@ -112,7 +105,7 @@
             // buttonRemoveMilitaryAircraft
             // 
             buttonRemoveMilitaryAircraft.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRemoveMilitaryAircraft.Location = new Point(4, 129);
+            buttonRemoveMilitaryAircraft.Location = new Point(4, 142);
             buttonRemoveMilitaryAircraft.Name = "buttonRemoveMilitaryAircraft";
             buttonRemoveMilitaryAircraft.Size = new Size(191, 49);
             buttonRemoveMilitaryAircraft.TabIndex = 5;
@@ -134,7 +127,7 @@
             // maskedTextBoxPosition
             // 
             maskedTextBoxPosition.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            maskedTextBoxPosition.Location = new Point(3, 96);
+            maskedTextBoxPosition.Location = new Point(3, 109);
             maskedTextBoxPosition.Mask = "00";
             maskedTextBoxPosition.Name = "maskedTextBoxPosition";
             maskedTextBoxPosition.Size = new Size(192, 27);
@@ -248,53 +241,12 @@
             // pictureBox
             // 
             pictureBox.Dock = DockStyle.Fill;
-            pictureBox.Location = new Point(0, 28);
+            pictureBox.Location = new Point(0, 0);
             pictureBox.Name = "pictureBox";
-            pictureBox.Size = new Size(744, 639);
+            pictureBox.Size = new Size(744, 667);
             pictureBox.TabIndex = 3;
             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(950, 28);
-            menuStrip.TabIndex = 4;
-            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";
-            // 
             // FormMilitaryAircraftCollection
             // 
             AutoScaleDimensions = new SizeF(8F, 20F);
@@ -302,8 +254,6 @@
             ClientSize = new Size(950, 667);
             Controls.Add(pictureBox);
             Controls.Add(groupBoxTools);
-            Controls.Add(menuStrip);
-            MainMenuStrip = menuStrip;
             Name = "FormMilitaryAircraftCollection";
             Text = "Коллекция военных самолётов";
             groupBoxTools.ResumeLayout(false);
@@ -312,10 +262,7 @@
             panelStorage.ResumeLayout(false);
             panelStorage.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
-            menuStrip.ResumeLayout(false);
-            menuStrip.PerformLayout();
             ResumeLayout(false);
-            PerformLayout();
         }
 
         #endregion
@@ -338,11 +285,5 @@
         private Button buttonCollectionAdd;
         private Button buttonCreateCompany;
         private Panel panelCompanyTools;
-        private MenuStrip menuStrip;
-        private ToolStripMenuItem файлToolStripMenuItem;
-        private ToolStripMenuItem saveToolStripMenuItem;
-        private ToolStripMenuItem loadToolStripMenuItem;
-        private SaveFileDialog saveFileDialog;
-        private OpenFileDialog openFileDialog;
     }
 }

AirFighter/AirFighter/FormMilitaryAircraftCollection.cs

@@ -1,5 +1,6 @@
 using ProjectAirFighter.CollectionGenericObjects;
 using ProjectAirFighter.Drawnings;
+using System.Windows.Forms;
 
 namespace ProjectAirFighter;
 
@@ -227,7 +228,12 @@ public partial class FormMilitaryAircraftCollection : Form
         RerfreshListBoxItems();
     }
 
-    private void saveToolStripMenuItem_Click(object sender, EventArgs e)
+    /// <summary>
+    /// Обработка нажатия "Сохранение"
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void SaveToolStripMenuItem_Click(object sender, EventArgs e)
     {
         if (saveFileDialog.ShowDialog() == DialogResult.OK)
         {
@@ -242,7 +248,12 @@ public partial class FormMilitaryAircraftCollection : Form
         }
     }
 
-    private void loadToolStripMenuItem_Click(object sender, EventArgs e)
+    /// <summary>
+    /// Обработка нажатия "Загрузка"
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void LoadToolStripMenuItem_Click(object sender, EventArgs e)
     {
         if (openFileDialog.ShowDialog() == DialogResult.OK)
         {

AirFighter/AirFighter/FormMilitaryAircraftCollection.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>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>