AirBomber/AirBomber/DrawningAirBomber.cs

@@ -22,12 +22,12 @@ namespace AirBomber
         /// <param name="width">Ширина картинки</param>
         /// <param name="height">Высота картинки</param>
         public DrawningAirBomber(int speed, double weight, Color bodyColor, Color
-        additionalColor, bool bombs, bool fuelTanks, int width, int height) :
+        additionalColor, bool bombs, Color bombsColor, bool fuelTanks, int width, int height) :
         base(speed, weight, bodyColor, width, height, 160, 118)
         {
             if (EntityAirPlane != null)
             {
-                EntityAirPlane = new EntityAirBomber(speed, weight, bodyColor, additionalColor, bombs, fuelTanks);
+                EntityAirPlane = new EntityAirBomber(speed, weight, bodyColor, additionalColor, bombs, bombsColor, fuelTanks);
             }
         }
         public override void DrawPlane(Graphics g)
@@ -38,13 +38,14 @@ namespace AirBomber
             }
             Pen pen = new(Color.Black);
             Brush additionalBrush = new SolidBrush(airBomber.AdditionalColor);
+            Brush bombsColor = new SolidBrush(airBomber.BombsColor);
             base.DrawPlane(g);
             // обвесы
-            g.FillEllipse(additionalBrush, _startPosX + 90, _startPosY + 20, 15, 29);
+            g.FillEllipse(bombsColor, _startPosX + 90, _startPosY + 20, 15, 29);
             g.DrawEllipse(pen, _startPosX + 90, _startPosY + 20, 15, 29);
-            g.FillEllipse(additionalBrush, _startPosX + 90, _startPosY + 70, 15, 29);
+            g.FillEllipse(bombsColor, _startPosX + 90, _startPosY + 70, 15, 29);
             g.DrawEllipse(pen, _startPosX + 90, _startPosY + 70, 15, 29);
-            g.FillEllipse(additionalBrush, _startPosX + 140, _startPosY + 50, 15, 15);
+            g.FillEllipse(bombsColor, _startPosX + 140, _startPosY + 50, 15, 15);
             g.DrawEllipse(pen, _startPosX + 140, _startPosY + 50, 15, 15);
             // fueltanks
             g.FillRectangle(additionalBrush, _startPosX + 63, _startPosY + 34, 20, 15);

AirBomber/AirBomber/EntityAirBomber.cs

@@ -14,10 +14,11 @@ namespace AirBomber
         public Color BombsColor { get; private set; }
         public bool FuelTanks { get; private set; } 
         public EntityAirBomber(int speed, double weight, Color bodyColor, Color
-        additionalColor, bool bombs, bool fuelTanks) : base(speed, weight, bodyColor)
+        additionalColor, bool bombs, Color bombsColor, bool fuelTanks) : base(speed, weight, bodyColor)
         {
             AdditionalColor = additionalColor;
             Bombs = bombs;
+            BombsColor = bombsColor;
             FuelTanks = fuelTanks;
         }
     }

AirBomber/AirBomber/FormAirBomber.Designer.cs

@@ -36,7 +36,7 @@
             pictureBoxAirBomber = new PictureBox();
             comboBoxStrategy = new ComboBox();
             buttonCreateAirPlane = new Button();
-            buttonStrategyStep = new Button();
+            buttonStep = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxAirBomber).BeginInit();
             SuspendLayout();
             // 
@@ -131,23 +131,23 @@
             buttonCreateAirPlane.UseVisualStyleBackColor = true;
             buttonCreateAirPlane.Click += buttonCreateAirPlane_Click;
             // 
-            // buttonStrategyStep
+            // buttonStep
             // 
-            buttonStrategyStep.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+            buttonStep.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            buttonStrategyStep.Location = new Point(862, 77);
+            buttonStep.Location = new Point(862, 77);
-            buttonStrategyStep.Name = "buttonStrategyStep";
+            buttonStep.Name = "buttonStep";
-            buttonStrategyStep.Size = new Size(112, 49);
+            buttonStep.Size = new Size(112, 49);
-            buttonStrategyStep.TabIndex = 8;
+            buttonStep.TabIndex = 8;
-            buttonStrategyStep.Text = "Шаг";
+            buttonStep.Text = "Шаг";
-            buttonStrategyStep.UseVisualStyleBackColor = true;
+            buttonStep.UseVisualStyleBackColor = true;
-            buttonStrategyStep.Click += buttonStrategyStep_Click;
+            buttonStep.Click += buttonStep_Click;
             // 
             // FormAirBomber
             // 
             AutoScaleDimensions = new SizeF(10F, 25F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(986, 540);
-            Controls.Add(buttonStrategyStep);
+            Controls.Add(buttonStep);
             Controls.Add(buttonCreateAirPlane);
             Controls.Add(comboBoxStrategy);
             Controls.Add(buttonUp);
@@ -172,6 +172,6 @@
         private PictureBox pictureBoxAirBomber;
         private ComboBox comboBoxStrategy;
         private Button buttonCreateAirPlane;
-        private Button buttonStrategyStep;
+        private Button buttonStep;
     }
 }

AirBomber/AirBomber/FormAirBomber.cs

@@ -6,17 +6,10 @@
         /// <summary>
         /// Стратегия перемещения
         /// </summary>
-        private AbstractStrategy? _strategy;
+        private AbstractStrategy? _abstractStrategy;
-        /// <summary>
-        /// Выбранный самолет
-        /// </summary>
-        public DrawningAirPlane? SelectedPlane { get; private set; }
-
         public FormAirBomber()
         {
             InitializeComponent();
-            _strategy = null;
-            SelectedPlane = null;
         }
         private void Draw()
         {
@@ -32,33 +25,25 @@
         private void buttonCreateAirBomber_Click(object sender, EventArgs e)
         {
             Random random = new();
-            Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
+            _drawningAirPlane = new DrawningAirBomber(random.Next(100, 300), random.Next(1000, 3000), Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
-            //TODO выбор основного цвета
+            Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
-
+            Convert.ToBoolean(random.Next(0, 2)), Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
-            Color dopColor = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
+            Convert.ToBoolean(random.Next(0, 2)),
-            //TODO выбор дополнительного цвета
+            pictureBoxAirBomber.Width, pictureBoxAirBomber.Height);
-
-            _drawningAirPlane = new DrawningAirBomber(random.Next(100, 300), random.Next(1000, 3000), color, dopColor,
-            Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), pictureBoxAirBomber.Width, pictureBoxAirBomber.Height);
 
             _drawningAirPlane.SetPosition(random.Next(10, 100), random.Next(10, 100));
             Draw();
+
         }
         private void buttonCreateAirPlane_Click(object sender, EventArgs e)
         {
             Random random = new();
-            Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
+            _drawningAirPlane = new DrawningAirPlane(random.Next(100, 300), random.Next(1000, 3000),
-
+            Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
-            ColorDialog dialog = new();
+            pictureBoxAirBomber.Width, pictureBoxAirBomber.Height);
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                color = dialog.Color;
-            }
-            _drawningAirPlane = new DrawningAirPlane(random.Next(100, 300), random.Next(1000, 3000), color, pictureBoxAirBomber.Width, pictureBoxAirBomber.Height);
 
             _drawningAirPlane.SetPosition(random.Next(10, 100), random.Next(10, 100));
             Draw();
-
         }
         private void buttonMove_Click(object sender, EventArgs e)
         {
@@ -84,7 +69,7 @@
             }
             Draw();
         }
-        private void buttonStrategyStep_Click(object sender, EventArgs e)
+        private void buttonStep_Click(object sender, EventArgs e)
         {
             if (_drawningAirPlane == null)
             {
@@ -92,42 +77,34 @@
             }
             if (comboBoxStrategy.Enabled)
             {
-                _strategy = comboBoxStrategy.SelectedIndex switch
+                _abstractStrategy = comboBoxStrategy.SelectedIndex
+                switch
                 {
                     0 => new MoveToCenter(),
                     1 => new MoveToBorder(),
                     _ => null,
                 };
-                if (_strategy == null)
+                if (_abstractStrategy == null)
                 {
                     return;
                 }
-                _strategy.SetData(_drawningAirPlane.GetMoveableObject,
+                _abstractStrategy.SetData(new
-                pictureBoxAirBomber.Width, pictureBoxAirBomber.Height);
+                DrawningObjectAirPlane(_drawningAirPlane), pictureBoxAirBomber.Width,
+                pictureBoxAirBomber.Height);
+                comboBoxStrategy.Enabled = false;
             }
-            if (_strategy == null)
+            if (_abstractStrategy == null)
             {
                 return;
             }
-            comboBoxStrategy.Enabled = false;
+            _abstractStrategy.MakeStep();
-            _strategy.MakeStep();
             Draw();
-            if (_strategy.GetStatus() == Status.Finish)
+            if (_abstractStrategy.GetStatus() == Status.Finish)
             {
                 comboBoxStrategy.Enabled = true;
-                _strategy = null;
+                _abstractStrategy = null;
             }
-        }
-        /// <summary>
-        /// Выбор самолета
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonSelectPlane_Click(object sender, EventArgs e)
-        {
-            SelectedPlane = _drawningAirPlane;
-            DialogResult = DialogResult.OK;
-        }
 
+        }
     }
 }

AirBomber/AirBomber/FormPlaneCollection.Designer.cs

@@ -1,126 +0,0 @@
-namespace AirBomber
-{
-    partial class FormPlaneCollection
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            pictureBoxCollection = new PictureBox();
-            panelTools = new Panel();
-            maskedTextBoxNumber = new MaskedTextBox();
-            buttonRefreshCollection = new Button();
-            buttonRemovePlane = new Button();
-            buttonAddPlane = new Button();
-            ((System.ComponentModel.ISupportInitialize)pictureBoxCollection).BeginInit();
-            panelTools.SuspendLayout();
-            SuspendLayout();
-            // 
-            // pictureBoxCollection
-            // 
-            pictureBoxCollection.BackColor = SystemColors.Control;
-            pictureBoxCollection.Dock = DockStyle.Left;
-            pictureBoxCollection.Location = new Point(0, 0);
-            pictureBoxCollection.Name = "pictureBoxCollection";
-            pictureBoxCollection.Size = new Size(708, 548);
-            pictureBoxCollection.TabIndex = 0;
-            pictureBoxCollection.TabStop = false;
-            // 
-            // panelTools
-            // 
-            panelTools.Controls.Add(maskedTextBoxNumber);
-            panelTools.Controls.Add(buttonRefreshCollection);
-            panelTools.Controls.Add(buttonRemovePlane);
-            panelTools.Controls.Add(buttonAddPlane);
-            panelTools.Dock = DockStyle.Right;
-            panelTools.Location = new Point(719, 0);
-            panelTools.Name = "panelTools";
-            panelTools.Size = new Size(237, 548);
-            panelTools.TabIndex = 1;
-            // 
-            // maskedTextBoxNumber
-            // 
-            maskedTextBoxNumber.Location = new Point(37, 218);
-            maskedTextBoxNumber.Mask = "00";
-            maskedTextBoxNumber.Name = "maskedTextBoxNumber";
-            maskedTextBoxNumber.Size = new Size(160, 31);
-            maskedTextBoxNumber.TabIndex = 3;
-            maskedTextBoxNumber.ValidatingType = typeof(int);
-            // 
-            // buttonRefreshCollection
-            // 
-            buttonRefreshCollection.Location = new Point(37, 394);
-            buttonRefreshCollection.Name = "buttonRefreshCollection";
-            buttonRefreshCollection.Size = new Size(160, 86);
-            buttonRefreshCollection.TabIndex = 2;
-            buttonRefreshCollection.Text = "Обновить коллекцию";
-            buttonRefreshCollection.UseVisualStyleBackColor = true;
-            buttonRefreshCollection.Click += buttonRefreshCollection_Click;
-            // 
-            // buttonRemovePlane
-            // 
-            buttonRemovePlane.Location = new Point(37, 266);
-            buttonRemovePlane.Name = "buttonRemovePlane";
-            buttonRemovePlane.Size = new Size(160, 60);
-            buttonRemovePlane.TabIndex = 1;
-            buttonRemovePlane.Text = "Удалить самолет";
-            buttonRemovePlane.UseVisualStyleBackColor = true;
-            buttonRemovePlane.Click += buttonRemovePlane_Click;
-            // 
-            // buttonAddPlane
-            // 
-            buttonAddPlane.Location = new Point(37, 94);
-            buttonAddPlane.Name = "buttonAddPlane";
-            buttonAddPlane.Size = new Size(160, 64);
-            buttonAddPlane.TabIndex = 0;
-            buttonAddPlane.Text = "Добавить самолет";
-            buttonAddPlane.UseVisualStyleBackColor = true;
-            buttonAddPlane.Click += buttonAddPlane_Click;
-            // 
-            // FormPlaneCollection
-            // 
-            AutoScaleDimensions = new SizeF(10F, 25F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(956, 548);
-            Controls.Add(panelTools);
-            Controls.Add(pictureBoxCollection);
-            Name = "FormPlaneCollection";
-            Text = "Набор самолетов";
-            ((System.ComponentModel.ISupportInitialize)pictureBoxCollection).EndInit();
-            panelTools.ResumeLayout(false);
-            panelTools.PerformLayout();
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private PictureBox pictureBoxCollection;
-        private Panel panelTools;
-        private MaskedTextBox maskedTextBoxNumber;
-        private Button buttonRefreshCollection;
-        private Button buttonRemovePlane;
-        private Button buttonAddPlane;
-    }
-}

AirBomber/AirBomber/FormPlaneCollection.cs

@@ -1,79 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace AirBomber
-{
-    public partial class FormPlaneCollection : Form
-    {
-        /// <summary>
-        /// Набор объектов
-        /// </summary>
-        private readonly PlanesGenericCollection<DrawningAirPlane, DrawningObjectAirPlane> _planes;
-
-        public FormPlaneCollection()
-        {
-            InitializeComponent();
-            _planes = new PlanesGenericCollection<DrawningAirPlane, DrawningObjectAirPlane>(pictureBoxCollection.Width, pictureBoxCollection.Height);
-
-        }
-        /// <summary>
-        /// Добавление объекта в набор
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void buttonAddPlane_Click(object sender, EventArgs e)
-        {
-            FormAirBomber form = new();
-            if (form.ShowDialog() == DialogResult.OK)
-            {
-                if (_planes + form.SelectedPlane)
-                {
-                    MessageBox.Show("Объект добавлен");
-                    pictureBoxCollection.Image = _planes.ShowCars();
-                }
-                else
-                {
-                    MessageBox.Show("Не удалось добавить объект");
-                }
-            }
-        }
-        /// <summary>
-        /// Удаление объекта из набора
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void buttonRemovePlane_Click(object sender, EventArgs e)
-        {
-            if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
-            {
-                return;
-            }
-            int pos = Convert.ToInt32(maskedTextBoxNumber.Text);
-            if (_planes - pos != null)
-            {
-                MessageBox.Show("Объект удален");
-                pictureBoxCollection.Image = _planes.ShowCars();
-            }
-            else
-            {
-                MessageBox.Show("Не удалось удалить объект");
-            }
-        }
-        /// <summary>
-        /// Обновление рисунка по набору
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void buttonRefreshCollection_Click(object sender, EventArgs e)
-        {
-            pictureBoxCollection.Image = _planes.ShowCars();
-        }
-    }
-}

AirBomber/AirBomber/FormPlaneCollection.resx

@@ -1,60 +0,0 @@
-<root>
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

AirBomber/AirBomber/PlanesGenericCollection.cs

@@ -6,129 +6,7 @@ using System.Threading.Tasks;
 
 namespace AirBomber
 {
-    internal class PlanesGenericCollection<T, U>
+    internal class PlanesGenericCollection
-        where T : DrawningAirPlane
-        where U : IMoveableObject
     {
-        /// <summary>
-        /// Ширина окна прорисовки
-        /// </summary>
-        private readonly int _pictureWidth;
-        /// <summary>
-        /// Высота окна прорисовки
-        /// </summary>
-        private readonly int _pictureHeight;
-        /// <summary>
-        /// Размер занимаемого объектом места (ширина)
-        /// </summary>
-        private readonly int _placeSizeWidth = 210;
-        /// <summary>
-        /// Размер занимаемого объектом места (высота)
-        /// </summary>
-        private readonly int _placeSizeHeight = 90;
-        /// <summary>
-        /// Набор объектов
-        /// </summary>
-        private readonly SetGeneric<T> _collection;
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        /// <param name="picWidth"></param>
-        /// <param name="picHeight"></param>
-        public PlanesGenericCollection(int picWidth, int picHeight)
-        {
-            int width = picWidth / _placeSizeWidth;
-            int height = picHeight / _placeSizeHeight;
-            _pictureWidth = picWidth;
-            _pictureHeight = picHeight;
-            _collection = new SetGeneric<T>(width * height);
-        }
-        /// <summary>
-        /// Перегрузка оператора сложения
-        /// </summary>
-        /// <param name="collect"></param>
-        /// <param name="obj"></param>
-        /// <returns></returns>
-        public static bool operator +(PlanesGenericCollection<T, U> collect, T?
-        obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-            return collect?._collection.Insert(obj) ?? false;
-        }
-
-        /// <summary>
-        /// Перегрузка оператора вычитания
-        /// </summary>
-        /// <param name="collect"></param>
-        /// <param name="pos"></param>
-        /// <returns></returns>
-        public static T? operator -(PlanesGenericCollection<T, U> collect, int
-        pos)
-        {
-            T? obj = collect._collection.Get(pos);
-            if (obj != null)
-            {
-                collect._collection.Remove(pos);
-            }
-            return obj;
-        }
-        /// <summary>
-        /// Получение объекта IMoveableObject
-        /// </summary>
-        /// <param name="pos"></param>
-        /// <returns></returns>
-        public U? GetU(int pos)
-        {
-            return (U?)_collection.Get(pos)?.GetMoveableObject;
-        }
-        /// <summary>
-        /// Вывод всего набора объектов
-        /// </summary>
-        /// <returns></returns>
-        public Bitmap ShowCars()
-        {
-            Bitmap bmp = new(_pictureWidth, _pictureHeight);
-            Graphics gr = Graphics.FromImage(bmp);
-            DrawBackground(gr);
-            DrawObjects(gr);
-            return bmp;
-        }
-        /// <summary>
-        /// Метод отрисовки фона
-        /// </summary>
-        /// <param name="g"></param>
-        private void DrawBackground(Graphics g)
-        {
-            Pen pen = new(Color.Black, 3);
-            for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++)
-            {
-                for (int j = 0; j < _pictureHeight / _placeSizeHeight +
-                1; ++j)
-                {//линия рамзетки места
-                    g.DrawLine(pen, i * _placeSizeWidth, j *
-                    _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2, j *
-                    _placeSizeHeight);
-                }
-                g.DrawLine(pen, i * _placeSizeWidth, 0, i *
-                _placeSizeWidth, _pictureHeight / _placeSizeHeight * _placeSizeHeight);
-            }
-        }
-        /// <summary>
-        /// Метод прорисовки объектов
-        /// </summary>
-        /// <param name="g"></param>
-        private void DrawObjects(Graphics g)
-        {
-            for (int i = 0; i < _collection.Count; i++)
-            {
-                // TODO получение объекта
-                // TODO установка позиции
-                // TODO прорисовка объекта
-            }
-        }
-
     }
 }

AirBomber/AirBomber/Program.cs

@@ -11,7 +11,7 @@ namespace AirBomber
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormPlaneCollection());
+            Application.Run(new FormAirBomber());
         }
     }
 }

AirBomber/AirBomber/SetGeneric.cs

@@ -6,72 +6,7 @@ using System.Threading.Tasks;
 
 namespace AirBomber
 {
-    internal class SetGeneric<T>
+    internal class SetGeneric
-        where T : class
     {
-        /// <summary>
-        /// Массив объектов, которые храним
-        /// </summary>
-        private readonly T?[] _places;
-        /// <summary>
-        /// Количество объектов в массиве
-        /// </summary>
-        public int Count => _places.Length;
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        /// <param name="count"></param>
-        public SetGeneric(int count)
-        {
-            _places = new T?[count];
-        }
-        /// <summary>
-        /// Добавление объекта в набор
-        /// </summary>
-        /// <param name="plane">Добавляемый самолет</param>
-        /// <returns></returns>
-        public bool Insert(T plane)
-        {
-            // TODO вставка в начало набора
-            return true;
-        }
-        /// <summary>
-        /// Добавление объекта в набор на конкретную позицию
-        /// </summary>
-        /// <param name="plane">Добавляемый самолет</param>
-        /// <param name="position">Позиция</param>
-        /// <returns></returns>
-        public bool Insert(T plane, int position)
-        {
-            // TODO проверка позиции
-            // TODO проверка, что элемент массива по этой позиции пустой,если нет, то
-        // проверка, что после вставляемого элемента в массиве есть пустой элемент
-        // сдвиг всех объектов, находящихся справа от позиции до первого пустого элемента
-        // TODO вставка по позиции
-            _places[position] = plane;
-            return true;
-        }
-        /// <summary>
-        /// Удаление объекта из набора с конкретной позиции
-        /// </summary>
-        /// <param name="position"></param>
-        /// <returns></returns>
-        public bool Remove(int position)
-        {
-            // TODO проверка позиции
-            // TODO удаление объекта из массива, присвоив элементу массива значение null
-        return true;
-        }
-        /// <summary>
-        /// Получение объекта из набора по позиции
-        /// </summary>
-        /// <param name="position"></param>
-        /// <returns></returns>
-        public T? Get(int position)
-        {
-            // TODO проверка позиции
-            return _places[position];
-        }
-
     }
 }