убраны комменты

AirFighter/AirFighter/CollectionGenericObjects/Angar.cs

@@ -3,7 +3,7 @@
 namespace ProjectAirFighter.CollectionGenericObjects;
 
 /// <summary>
-/// Реализация абстрактной компании - ангар
+/// Реализация абстрактной компании - каршеринг 
 /// </summary>
 public class Angar : AbstractCompany
 {

AirFighter/AirFighter/CollectionGenericObjects/CollectionType.cs

@@ -1,22 +0,0 @@
-namespace ProjectAirFighter.CollectionGenericObjects;
-
-/// <summary>
-/// Тип коллекции
-/// </summary>
-public enum CollectionType
-{
-    /// <summary>
-    /// Неопределено
-    /// </summary>
-    None = 0,
-
-    /// <summary>
-    /// Массив
-    /// </summary>
-    Massive = 1,
-
-    /// <summary>
-    /// Список
-    /// </summary>
-    List = 2
-}

AirFighter/AirFighter/CollectionGenericObjects/ListGenericObjects.cs

@@ -1,60 +0,0 @@
-namespace ProjectAirFighter.CollectionGenericObjects;
-
-/// <summary>
-/// Параметризованный набор объектов
-/// </summary>
-/// <typeparam name="T">Параметр: ограничение - ссылочный тип</typeparam>
-public class ListGenericObjects<T> : ICollectionGenericObjects<T>
-    where T : class
-{
-    /// <summary>
-    /// Список объектов, которые храним
-    /// </summary>
-    private readonly List<T?> _collection;
-
-    /// <summary>
-    /// Максимально допустимое число объектов в списке
-    /// </summary>
-    private int _maxCount;
-
-    public int Count => _collection.Count;
-
-    public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } }
-
-    /// <summary>
-    /// Конструктор
-    /// </summary>
-    public ListGenericObjects()
-    {
-        _collection = new();
-    }
-
-    public T? Get(int position)
-    {
-        if (position >= Count || position < 0) return null;
-        return _collection[position];
-    }
-
-    public int Insert(T obj)
-    {
-        if (Count + 1 > _maxCount) return -1;
-        _collection.Add(obj);
-        return Count;
-    }
-
-    public int Insert(T obj, int position)
-    {
-        if (Count + 1 > _maxCount) return -1;
-        if (position < 0 || position > Count) return -1;
-        _collection.Insert(position, obj);
-        return 1;
-    }
-
-    public T? Remove(int position)
-    {
-        if (position < 0 || position > Count) return null;
-        T? pos = _collection[position];
-        _collection.RemoveAt(position);
-        return pos;
-    }
-}

AirFighter/AirFighter/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -98,8 +98,8 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
     public T? Remove(int position)
     {
         if (position >= _collection.Length || position < 0)
-        {
-            return null;
+        { 
+            return null; 
         }
         T obj = _collection[position];
         _collection[position] = null;

AirFighter/AirFighter/CollectionGenericObjects/StorageCollection.cs

@@ -1,73 +0,0 @@
-namespace ProjectAirFighter.CollectionGenericObjects;
-
-/// <summary>
-/// Класс-хранилище коллекций
-/// </summary>
-/// <typeparam name="T"></typeparam>
-public class StorageCollection<T>
-    where T : class
-{
-    /// <summary>
-    /// Словарь (хранилище) с коллекциями
-    /// </summary>
-    readonly Dictionary<string, ICollectionGenericObjects<T>> _storages;
-
-    /// <summary>
-    /// Возвращение списка названий коллекций
-    /// </summary>
-    public List<string> Keys => _storages.Keys.ToList();
-
-    /// <summary>
-    /// Конструктор
-    /// </summary>
-    public StorageCollection()
-    {
-        _storages = new Dictionary<string, ICollectionGenericObjects<T>>(); //вот тут какое-то свойство 
-    }
-
-    /// <summary>
-    /// Добавление коллекции в хранилище
-    /// </summary>
-    /// <param name="name">Название коллекции</param>
-    /// <param name="collectionType">тип коллекции</param>
-    public void AddCollection(string name, CollectionType collectionType)
-    {
-        if (name == null || _storages.ContainsKey(name)) { return; }
-        switch (collectionType)
-
-        {
-            case CollectionType.None:
-                return;
-            case CollectionType.Massive:
-                _storages[name] = new MassiveGenericObjects<T>();
-                return;
-            case CollectionType.List:
-                _storages[name] = new ListGenericObjects<T>();
-                return;
-        }
-    }
-
-    /// <summary>
-    /// Удаление коллекции
-    /// </summary>
-    /// <param name="name">Название коллекции</param>
-    public void DelCollection(string name)
-    {
-        if (_storages.ContainsKey(name))
-            _storages.Remove(name);
-    }
-
-    /// <summary>
-    /// Доступ к коллекции
-    /// </summary>
-    /// <param name="name">Название коллекции</param>
-    /// <returns></returns>
-    public ICollectionGenericObjects<T>? this[string name]
-    {
-        get
-        {
-            if (name == null || !_storages.ContainsKey(name)) { return null; }
-            return _storages[name];
-        }
-    }
-}

AirFighter/AirFighter/Drawnings/DrawningAirFighter.cs

@@ -17,24 +17,24 @@ public class DrawningAirFighter : DrawningMilitaryAircraft
     /// <param name="additionalColor">Дополнительный цвет</param>
     /// <param name="wings">Признак наличия доп крыльев</param>
     /// <param name="rockets">Признак наличия ракет</param>
-    public DrawningAirFighter(int speed, double weight, Color bodyColor, Color additionalColor, bool wings, bool rockets) : base(70, 70)
+    public DrawningAirFighter (int speed, double weight, Color bodyColor, Color additionalColor, bool wings, bool rockets) : base (70, 70)
     {
         EntityMilitaryAircraft = new EntityAirFighter(speed, weight, bodyColor, additionalColor, wings, rockets);
     }
 
     public override void DrawTransport(Graphics g)
     {
-        if (EntityMilitaryAircraft == null || EntityMilitaryAircraft is not EntityAirFighter airFighter || !_startPosX.HasValue || !_startPosY.HasValue)
+        if (EntityMilitaryAircraft == null || EntityMilitaryAircraft is not EntityAirFighter militaryAircraftFighter || !_startPosX.HasValue || !_startPosY.HasValue)
         {
             return;
         }
 
         Pen pen = new(Color.Black);
-        Brush additionalBrush = new SolidBrush(airFighter.AdditionalColor);
+        Brush additionalBrush = new SolidBrush(militaryAircraftFighter.AdditionalColor);
 
         base.DrawTransport(g);
 
-        if (airFighter.Wings)
+        if (militaryAircraftFighter.Wings)
         {
             Point wings1 = new Point(_startPosX.Value + 45, _startPosY.Value + 30);
             Point wings2 = new Point(_startPosX.Value + 45, _startPosY.Value + 15);
@@ -53,7 +53,7 @@ public class DrawningAirFighter : DrawningMilitaryAircraft
             g.DrawPolygon(pen, DownWing);
         }
 
-        if (airFighter.Rockets)
+        if (militaryAircraftFighter.Rockets)
         {
             Point rocket1 = new Point(_startPosX.Value + 40, _startPosY.Value + 5);
             Point rocket2 = new Point(_startPosX.Value + 15, _startPosY.Value + 5);

AirFighter/AirFighter/Drawnings/DrawningMilitaryAircraft.cs

@@ -23,22 +23,22 @@ public class DrawningMilitaryAircraft
     private int? _pictureHeight;
 
     /// <summary>
-	/// Левая координата прорисовки  самолёта
+	/// Левая координата прорисовки самолёта
 	/// </summary>
     protected int? _startPosX;
 
     /// <summary>
-	/// Верхняя кооридната прорисовки военного самолёта
+	/// Верхняя кооридната прорисовки самолёта
 	/// </summary>
     protected int? _startPosY;
 
     /// <summary>
-	/// Ширина прорисовки военного самолёта
+	/// Ширина прорисовки самолёта
 	/// </summary>
     private readonly int _drawningMilitaryAircraftWidth = 70;
 
     /// <summary>
-	/// Высота прорисовки военного самолёта
+	/// Высота прорисовки самолёта
 	/// </summary>
     private readonly int _drawningMilitaryAircraftHeight = 70;
 
@@ -79,7 +79,7 @@ public class DrawningMilitaryAircraft
 	/// <param name="speed">Скорость</param>
 	/// <param name="weight">Вес</param>
 	/// <param name="bodyColor">Основной цвет</param>
-    public DrawningMilitaryAircraft(int speed, double weight, Color bodyColor) : this()
+    public DrawningMilitaryAircraft (int speed, double weight, Color bodyColor) : this()
     {
         EntityMilitaryAircraft = new EntityMilitaryAircraft(speed, weight, bodyColor);
     }
@@ -87,9 +87,9 @@ public class DrawningMilitaryAircraft
     /// <summary>
 	/// Конструктор для наследников
 	/// </summary>
-	/// <param name="drawningCarWidth">Ширина прорисовки военного самолёта</param>
-	/// <param name="drawningCarHeight">Высота прорисовки военного самолёта</param>
-    protected DrawningMilitaryAircraft(int drawningMilitaryAircraftWidth, int drawningMilitaryAircraftHeight) : this()
+	/// <param name="drawningMilitaryAircraftWidth">Ширина прорисовки самолёта</param>
+	/// <param name="drawningMilitaryAircraftHeight">Высота прорисовки самолёта</param>
+    protected DrawningMilitaryAircraft(int drawningMilitaryAircraftWidth, int drawningMilitaryAircraftHeight) : this() 
     {
         _drawningMilitaryAircraftWidth = drawningMilitaryAircraftWidth;
         _drawningMilitaryAircraftHeight = drawningMilitaryAircraftHeight;

AirFighter/AirFighter/Entities/EntityMilitaryAircraft.cs

@@ -17,10 +17,10 @@ public class EntityMilitaryAircraft
 	/// Конструктор сущности
 	/// </summary>
 	/// <param name="speed">Скорость</param>
-	/// <param name="weight">Вес автомобиля</param>
+	/// <param name="weight">Вес</param>
 	/// <param name="bodyColor">Основной цвет</param>
 
-    public EntityMilitaryAircraft(int speed, double weight, Color bodyColor)
+    public EntityMilitaryAircraft (int speed, double weight, Color bodyColor)
     {
         Speed = speed;
         Weight = weight;

AirFighter/AirFighter/FormAirFighter.resx

@@ -28,7 +28,7 @@
     </data>
 
     There are any number of "resheader" rows that contain simple
-    name/value pairs.
+    name/value pmilitaryAircrafts.
 
     Each data row contains a name, and value. The row also contains a
     type or mimetype. Type corresponds to a .NET class that support

AirFighter/AirFighter/FormMilitaryAircraftCollection.Designer.cs

@@ -29,142 +29,41 @@
         private void InitializeComponent()
         {
             groupBoxTools = new GroupBox();
-            buttonCreateCompany = new Button();
-            panelStorage = new Panel();
-            buttonCollectionDel = new Button();
-            listBoxCollection = new ListBox();
-            buttonCollectionAdd = new Button();
-            textBoxCollectionName = new TextBox();
-            radioButtonMassive = new RadioButton();
-            radioButtonList = new RadioButton();
-            labelCollectionName = new Label();
             buttonRefresh = new Button();
             buttonGoToCheck = new Button();
-            buttonRemoveMilitaryAircraft = new Button();
+            buttonRemoveAir = new Button();
             maskedTextBoxPosition = new MaskedTextBox();
             buttonAddAirFighter = new Button();
-            buttonAddMilitaryAircraft = new Button();
+            buttonAddAir = new Button();
             comboBoxSelectorCompany = new ComboBox();
             pictureBox = new PictureBox();
-            panelCompanyTools = new Panel();
             groupBoxTools.SuspendLayout();
-            panelStorage.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
-            panelCompanyTools.SuspendLayout();
             SuspendLayout();
             // 
             // groupBoxTools
             // 
-            groupBoxTools.Controls.Add(panelCompanyTools);
-            groupBoxTools.Controls.Add(buttonCreateCompany);
-            groupBoxTools.Controls.Add(panelStorage);
+            groupBoxTools.Controls.Add(buttonRefresh);
+            groupBoxTools.Controls.Add(buttonGoToCheck);
+            groupBoxTools.Controls.Add(buttonRemoveAir);
+            groupBoxTools.Controls.Add(maskedTextBoxPosition);
+            groupBoxTools.Controls.Add(buttonAddAirFighter);
+            groupBoxTools.Controls.Add(buttonAddAir);
             groupBoxTools.Controls.Add(comboBoxSelectorCompany);
             groupBoxTools.Dock = DockStyle.Right;
-            groupBoxTools.Location = new Point(744, 0);
+            groupBoxTools.Location = new Point(594, 0);
             groupBoxTools.Name = "groupBoxTools";
-            groupBoxTools.Size = new Size(206, 667);
+            groupBoxTools.Size = new Size(206, 450);
             groupBoxTools.TabIndex = 0;
             groupBoxTools.TabStop = false;
             groupBoxTools.Text = "Инструменты";
             // 
-            // buttonCreateCompany
-            // 
-            buttonCreateCompany.Location = new Point(7, 322);
-            buttonCreateCompany.Name = "buttonCreateCompany";
-            buttonCreateCompany.Size = new Size(191, 29);
-            buttonCreateCompany.TabIndex = 9;
-            buttonCreateCompany.Text = "Создание компании";
-            buttonCreateCompany.UseVisualStyleBackColor = true;
-            buttonCreateCompany.Click += buttonCreateCompany_Click;
-            // 
-            // panelStorage
-            // 
-            panelStorage.Controls.Add(buttonCollectionDel);
-            panelStorage.Controls.Add(listBoxCollection);
-            panelStorage.Controls.Add(buttonCollectionAdd);
-            panelStorage.Controls.Add(textBoxCollectionName);
-            panelStorage.Controls.Add(radioButtonMassive);
-            panelStorage.Controls.Add(radioButtonList);
-            panelStorage.Controls.Add(labelCollectionName);
-            panelStorage.Dock = DockStyle.Top;
-            panelStorage.Location = new Point(3, 23);
-            panelStorage.Name = "panelStorage";
-            panelStorage.Size = new Size(200, 256);
-            panelStorage.TabIndex = 8;
-            // 
-            // buttonCollectionDel
-            // 
-            buttonCollectionDel.Location = new Point(6, 224);
-            buttonCollectionDel.Name = "buttonCollectionDel";
-            buttonCollectionDel.Size = new Size(189, 29);
-            buttonCollectionDel.TabIndex = 6;
-            buttonCollectionDel.Text = "Удаление коллекции";
-            buttonCollectionDel.UseVisualStyleBackColor = true;
-            buttonCollectionDel.Click += buttonCollectionDel_Click;
-            // 
-            // listBoxCollection
-            // 
-            listBoxCollection.FormattingEnabled = true;
-            listBoxCollection.ItemHeight = 20;
-            listBoxCollection.Location = new Point(6, 131);
-            listBoxCollection.Name = "listBoxCollection";
-            listBoxCollection.Size = new Size(189, 84);
-            listBoxCollection.TabIndex = 5;
-            // 
-            // buttonCollectionAdd
-            // 
-            buttonCollectionAdd.Location = new Point(6, 96);
-            buttonCollectionAdd.Name = "buttonCollectionAdd";
-            buttonCollectionAdd.Size = new Size(189, 29);
-            buttonCollectionAdd.TabIndex = 4;
-            buttonCollectionAdd.Text = "Добавить коллекцию";
-            buttonCollectionAdd.UseVisualStyleBackColor = true;
-            buttonCollectionAdd.Click += buttonCollectionAdd_Click;
-            // 
-            // textBoxCollectionName
-            // 
-            textBoxCollectionName.Location = new Point(6, 33);
-            textBoxCollectionName.Name = "textBoxCollectionName";
-            textBoxCollectionName.Size = new Size(189, 27);
-            textBoxCollectionName.TabIndex = 3;
-            // 
-            // radioButtonMassive
-            // 
-            radioButtonMassive.AutoSize = true;
-            radioButtonMassive.Location = new Point(6, 66);
-            radioButtonMassive.Name = "radioButtonMassive";
-            radioButtonMassive.Size = new Size(82, 24);
-            radioButtonMassive.TabIndex = 2;
-            radioButtonMassive.TabStop = true;
-            radioButtonMassive.Text = "Массив";
-            radioButtonMassive.UseVisualStyleBackColor = true;
-            // 
-            // radioButtonList
-            // 
-            radioButtonList.AutoSize = true;
-            radioButtonList.Location = new Point(115, 66);
-            radioButtonList.Name = "radioButtonList";
-            radioButtonList.Size = new Size(80, 24);
-            radioButtonList.TabIndex = 1;
-            radioButtonList.TabStop = true;
-            radioButtonList.Text = "Список";
-            radioButtonList.UseVisualStyleBackColor = true;
-            // 
-            // labelCollectionName
-            // 
-            labelCollectionName.AutoSize = true;
-            labelCollectionName.Location = new Point(17, 10);
-            labelCollectionName.Name = "labelCollectionName";
-            labelCollectionName.Size = new Size(158, 20);
-            labelCollectionName.TabIndex = 0;
-            labelCollectionName.Text = "Название коллекции:";
-            // 
             // buttonRefresh
             // 
             buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRefresh.Location = new Point(3, 252);
+            buttonRefresh.Location = new Point(6, 395);
             buttonRefresh.Name = "buttonRefresh";
-            buttonRefresh.Size = new Size(192, 49);
+            buttonRefresh.Size = new Size(197, 29);
             buttonRefresh.TabIndex = 7;
             buttonRefresh.Text = "Обновить";
             buttonRefresh.UseVisualStyleBackColor = true;
@@ -173,56 +72,55 @@
             // buttonGoToCheck
             // 
             buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonGoToCheck.Location = new Point(3, 197);
+            buttonGoToCheck.Location = new Point(6, 328);
             buttonGoToCheck.Name = "buttonGoToCheck";
-            buttonGoToCheck.Size = new Size(192, 49);
+            buttonGoToCheck.Size = new Size(197, 29);
             buttonGoToCheck.TabIndex = 6;
             buttonGoToCheck.Text = "Передать на тесты";
             buttonGoToCheck.UseVisualStyleBackColor = true;
             buttonGoToCheck.Click += buttonGoToCheck_Click;
             // 
-            // buttonRemoveMilitaryAircraft
+            // buttonRemoveAir
             // 
-            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;
+            buttonRemoveAir.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRemoveAir.Location = new Point(5, 211);
+            buttonRemoveAir.Name = "buttonRemoveAir";
+            buttonRemoveAir.Size = new Size(197, 29);
+            buttonRemoveAir.TabIndex = 5;
+            buttonRemoveAir.Text = "Удаление самолёта";
+            buttonRemoveAir.UseVisualStyleBackColor = true;
+            buttonRemoveAir.Click += buttonRemoveAir_Click;
             // 
             // maskedTextBoxPosition
             // 
-            maskedTextBoxPosition.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            maskedTextBoxPosition.Location = new Point(3, 109);
+            maskedTextBoxPosition.Location = new Point(6, 161);
             maskedTextBoxPosition.Mask = "00";
             maskedTextBoxPosition.Name = "maskedTextBoxPosition";
-            maskedTextBoxPosition.Size = new Size(192, 27);
+            maskedTextBoxPosition.Size = new Size(194, 27);
             maskedTextBoxPosition.TabIndex = 4;
             maskedTextBoxPosition.ValidatingType = typeof(int);
             // 
             // buttonAddAirFighter
             // 
             buttonAddAirFighter.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonAddAirFighter.Location = new Point(3, 54);
+            buttonAddAirFighter.Location = new Point(6, 103);
             buttonAddAirFighter.Name = "buttonAddAirFighter";
-            buttonAddAirFighter.Size = new Size(192, 49);
+            buttonAddAirFighter.Size = new Size(197, 31);
             buttonAddAirFighter.TabIndex = 2;
             buttonAddAirFighter.Text = "Добавление истребителя";
             buttonAddAirFighter.UseVisualStyleBackColor = true;
             buttonAddAirFighter.Click += buttonAddAirFighter_Click;
             // 
-            // buttonAddMilitaryAircraft
+            // buttonAddAir
             // 
-            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;
+            buttonAddAir.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddAir.Location = new Point(6, 68);
+            buttonAddAir.Name = "buttonAddAir";
+            buttonAddAir.Size = new Size(197, 29);
+            buttonAddAir.TabIndex = 1;
+            buttonAddAir.Text = "Добавление самолёта";
+            buttonAddAir.UseVisualStyleBackColor = true;
+            buttonAddAir.Click += buttonAddAir_Click;
             // 
             // comboBoxSelectorCompany
             // 
@@ -230,9 +128,9 @@
             comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
             comboBoxSelectorCompany.FormattingEnabled = true;
             comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
-            comboBoxSelectorCompany.Location = new Point(7, 285);
+            comboBoxSelectorCompany.Location = new Point(6, 26);
             comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
-            comboBoxSelectorCompany.Size = new Size(193, 28);
+            comboBoxSelectorCompany.Size = new Size(194, 28);
             comboBoxSelectorCompany.TabIndex = 0;
             comboBoxSelectorCompany.SelectedIndexChanged += comboBoxSelectorCompany_SelectedIndexChanged;
             // 
@@ -241,40 +139,22 @@
             pictureBox.Dock = DockStyle.Fill;
             pictureBox.Location = new Point(0, 0);
             pictureBox.Name = "pictureBox";
-            pictureBox.Size = new Size(744, 667);
+            pictureBox.Size = new Size(594, 450);
             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
+            // FormAirCollection
             // 
             AutoScaleDimensions = new SizeF(8F, 20F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(950, 667);
+            ClientSize = new Size(800, 450);
             Controls.Add(pictureBox);
             Controls.Add(groupBoxTools);
-            Name = "FormMilitaryAircraftCollection";
-            Text = "Коллекция военных самолётов";
+            Name = "FormAirCollection";
+            Text = "Коллекция самолётов";
             groupBoxTools.ResumeLayout(false);
-            panelStorage.ResumeLayout(false);
-            panelStorage.PerformLayout();
+            groupBoxTools.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
-            panelCompanyTools.ResumeLayout(false);
-            panelCompanyTools.PerformLayout();
             ResumeLayout(false);
         }
 
@@ -282,22 +162,12 @@
 
         private GroupBox groupBoxTools;
         private ComboBox comboBoxSelectorCompany;
+        private Button buttonAddAir;
         private Button buttonAddAirFighter;
-        private Button buttonAddMilitaryAircraft;
-        private MaskedTextBox maskedTextBoxPosition;
         private PictureBox pictureBox;
+        private MaskedTextBox maskedTextBoxPosition;
+        private Button buttonRemoveAir;
         private Button buttonRefresh;
         private Button buttonGoToCheck;
-        private Button buttonRemoveMilitaryAircraft;
-        private Panel panelStorage;
-        private TextBox textBoxCollectionName;
-        private RadioButton radioButtonMassive;
-        private RadioButton radioButtonList;
-        private Label labelCollectionName;
-        private Button buttonCollectionDel;
-        private ListBox listBoxCollection;
-        private Button buttonCollectionAdd;
-        private Button buttonCreateCompany;
-        private Panel panelCompanyTools;
     }
 }

AirFighter/AirFighter/FormMilitaryAircraftCollection.cs

@@ -5,11 +5,6 @@ namespace ProjectAirFighter;
 
 public partial class FormMilitaryAircraftCollection : Form
 {
-    /// <summary>
-	/// Хранилише коллекций
-	/// </summary>
-	private readonly StorageCollection<DrawningMilitaryAircraft> _storageCollection;
-
     /// <summary>
     /// Компания
     /// </summary>
@@ -21,7 +16,6 @@ public partial class FormMilitaryAircraftCollection : Form
     public FormMilitaryAircraftCollection()
     {
         InitializeComponent();
-        _storageCollection = new();
     }
 
     /// <summary>
@@ -31,7 +25,12 @@ public partial class FormMilitaryAircraftCollection : Form
     /// <param name="e"></param>
     private void comboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
     {
-        panelCompanyTools.Enabled = false;
+        switch (comboBoxSelectorCompany.Text)
+        {
+            case "Хранилище":
+                _company = new Angar(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects<DrawningMilitaryAircraft>());
+                break;
+        }
     }
 
     /// <summary>
@@ -39,7 +38,7 @@ public partial class FormMilitaryAircraftCollection : Form
     /// </summary>
     /// <param name="sender"></param>
     /// <param name="e"></param>
-    private void buttonAddMilitaryAircraft_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningMilitaryAircraft));
+    private void buttonAddAir_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningMilitaryAircraft));
 
     /// <summary>
     /// Добавление истребителя
@@ -105,7 +104,7 @@ public partial class FormMilitaryAircraftCollection : Form
     /// </summary>
     /// <param name="sender"></param>
     /// <param name="e"></param>
-    private void buttonRemoveMilitaryAircraft_Click(object sender, EventArgs e)
+    private void buttonRemoveAir_Click(object sender, EventArgs e)
     {
         if (string.IsNullOrEmpty(maskedTextBoxPosition.Text) || _company == null)
         {
@@ -179,81 +178,4 @@ public partial class FormMilitaryAircraftCollection : Form
 
         pictureBox.Image = _company.Show();
     }
-
-    private void buttonCollectionAdd_Click(object sender, EventArgs e)
-    {
-        if (string.IsNullOrEmpty(textBoxCollectionName.Text) || (!radioButtonList.Checked && !radioButtonMassive.Checked))
-        {
-            MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            return;
-        }
-
-        CollectionType collectionType = CollectionType.None;
-        if (radioButtonMassive.Checked)
-        {
-            collectionType = CollectionType.Massive;
-        }
-        else if (radioButtonList.Checked)
-        {
-            collectionType = CollectionType.List;
-        }
-
-        _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
-        RerfreshListBoxItems();
-    }
-
-    private void buttonCollectionDel_Click(object sender, EventArgs e)
-    {
-        if (listBoxCollection.SelectedItem == null)
-        {
-            MessageBox.Show("Коллекция не выбрана");
-            return;
-        }
-        if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
-        {
-            return;
-        }
-        _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
-        RerfreshListBoxItems();
-    }
-
-    private void RerfreshListBoxItems()
-    {
-        listBoxCollection.Items.Clear();
-        for (int i = 0; i < _storageCollection.Keys?.Count; ++i)
-        {
-            string? colName = _storageCollection.Keys?[i];
-            if (!string.IsNullOrEmpty(colName))
-            {
-                listBoxCollection.Items.Add(colName);
-            }
-        }
-
-    }
-
-    private void buttonCreateCompany_Click(object sender, EventArgs e)
-    {
-        if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
-        {
-            MessageBox.Show("Коллекция не выбрана");
-            return;
-        }
-
-        ICollectionGenericObjects<DrawningMilitaryAircraft>? collection = _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
-        if (collection == null)
-        {
-            MessageBox.Show("Коллекция не проинициализирована");
-            return;
-        }
-
-        switch (comboBoxSelectorCompany.Text)
-        {
-            case "Хранилище":
-                _company = new Angar(pictureBox.Width, pictureBox.Height, collection);
-                break;
-        }
-
-        panelCompanyTools.Enabled = true;
-        RerfreshListBoxItems();
-    }
 }

AirFighter/AirFighter/MovementStrategy/MoveToBorder.cs

@@ -10,9 +10,9 @@ public class MoveToBorder : AbstractStrategy
             return false;
         }
 
-        return objParams.RightBorder <= FieldWidth &&
+        return objParams.RightBorder <= FieldWidth && 
             objParams.RightBorder + GetStep() >= FieldWidth &&
-            objParams.DownBorder <= FieldHeight &&
+            objParams.DownBorder <= FieldHeight && 
             objParams.DownBorder + GetStep() >= FieldHeight;
     }
 

AirFighter/AirFighter/MovementStrategy/MoveToCenter.cs

@@ -15,7 +15,7 @@ public class MoveToCenter : AbstractStrategy
 
         return objParams.ObjectMiddleHorizontal - GetStep() <= FieldWidth / 2 &&
             objParams.ObjectMiddleHorizontal + GetStep() >= FieldWidth / 2 &&
-            objParams.ObjectMiddleVertical - GetStep() <= FieldHeight / 2 &&
+            objParams.ObjectMiddleVertical - GetStep() <= FieldHeight / 2 && 
             objParams.ObjectMiddleVertical + GetStep() >= FieldHeight / 2;
     }
 

AirFighter/AirFighter/Properties/Resources.resx

@@ -28,7 +28,7 @@
     </data>
                 
     There are any number of "resheader" rows that contain simple 
-    name/value pairs.
+    name/value pmilitaryAircrafts.
     
     Each data row contains a name, and value. The row also contains a 
     type or mimetype. Type corresponds to a .NET class that support