Merge pull request 'Zhimolostnova A.V. Lab work 4' (#4) from LabRab_4 into LabRab_3

Reviewed-on: http://student.git.athene.tech/AnnZhimol/PIbd-22_Zhimolostnova_A.V._Battleship._Base/pulls/4

Warship/Warship/FormMapWithSetWarships.Designer.cs

@@ -29,6 +29,11 @@
         private void InitializeComponent()
         {
             this.groupBoxTools = new System.Windows.Forms.GroupBox();
+            this.groupBoxMaps = new System.Windows.Forms.GroupBox();
+            this.ButtonDeleteMap = new System.Windows.Forms.Button();
+            this.listBoxMaps = new System.Windows.Forms.ListBox();
+            this.ButtonAddMap = new System.Windows.Forms.Button();
+            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
             this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
             this.buttonRemoveWarship = new System.Windows.Forms.Button();
             this.buttonShowStorage = new System.Windows.Forms.Button();
@@ -38,14 +43,16 @@
             this.buttonUp = new System.Windows.Forms.Button();
             this.buttonShowOnMap = new System.Windows.Forms.Button();
             this.buttonAddWarship = new System.Windows.Forms.Button();
-            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
             this.pictureBox = new System.Windows.Forms.PictureBox();
+            this.textBoxMap = new System.Windows.Forms.TextBox();
             this.groupBoxTools.SuspendLayout();
+            this.groupBoxMaps.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
             this.SuspendLayout();
             // 
             // groupBoxTools
             // 
+            this.groupBoxTools.Controls.Add(this.groupBoxMaps);
             this.groupBoxTools.Controls.Add(this.maskedTextBoxPosition);
             this.groupBoxTools.Controls.Add(this.buttonRemoveWarship);
             this.groupBoxTools.Controls.Add(this.buttonShowStorage);
@@ -55,18 +62,73 @@
             this.groupBoxTools.Controls.Add(this.buttonUp);
             this.groupBoxTools.Controls.Add(this.buttonShowOnMap);
             this.groupBoxTools.Controls.Add(this.buttonAddWarship);
-            this.groupBoxTools.Controls.Add(this.comboBoxSelectorMap);
             this.groupBoxTools.Dock = System.Windows.Forms.DockStyle.Right;
-            this.groupBoxTools.Location = new System.Drawing.Point(811, 0);
+            this.groupBoxTools.Location = new System.Drawing.Point(859, 0);
             this.groupBoxTools.Name = "groupBoxTools";
-            this.groupBoxTools.Size = new System.Drawing.Size(204, 554);
+            this.groupBoxTools.Size = new System.Drawing.Size(204, 652);
             this.groupBoxTools.TabIndex = 0;
             this.groupBoxTools.TabStop = false;
             this.groupBoxTools.Text = "Инструменты";
             // 
+            // groupBoxMaps
+            // 
+            this.groupBoxMaps.Controls.Add(this.textBoxMap);
+            this.groupBoxMaps.Controls.Add(this.ButtonDeleteMap);
+            this.groupBoxMaps.Controls.Add(this.listBoxMaps);
+            this.groupBoxMaps.Controls.Add(this.ButtonAddMap);
+            this.groupBoxMaps.Controls.Add(this.comboBoxSelectorMap);
+            this.groupBoxMaps.Location = new System.Drawing.Point(10, 22);
+            this.groupBoxMaps.Name = "groupBoxMaps";
+            this.groupBoxMaps.Size = new System.Drawing.Size(188, 266);
+            this.groupBoxMaps.TabIndex = 11;
+            this.groupBoxMaps.TabStop = false;
+            this.groupBoxMaps.Text = "Карты";
+            // 
+            // ButtonDeleteMap
+            // 
+            this.ButtonDeleteMap.Location = new System.Drawing.Point(12, 223);
+            this.ButtonDeleteMap.Name = "ButtonDeleteMap";
+            this.ButtonDeleteMap.Size = new System.Drawing.Size(168, 33);
+            this.ButtonDeleteMap.TabIndex = 4;
+            this.ButtonDeleteMap.Text = "Удалить карту";
+            this.ButtonDeleteMap.UseVisualStyleBackColor = true;
+            this.ButtonDeleteMap.Click += new System.EventHandler(this.ButtonDeleteMap_Click);
+            // 
+            // listBoxMaps
+            // 
+            this.listBoxMaps.FormattingEnabled = true;
+            this.listBoxMaps.ItemHeight = 15;
+            this.listBoxMaps.Location = new System.Drawing.Point(10, 118);
+            this.listBoxMaps.Name = "listBoxMaps";
+            this.listBoxMaps.Size = new System.Drawing.Size(170, 94);
+            this.listBoxMaps.TabIndex = 3;
+            this.listBoxMaps.SelectedIndexChanged += new System.EventHandler(this.ListBoxMaps_SelectedIndexChanged);
+            // 
+            // ButtonAddMap
+            // 
+            this.ButtonAddMap.Location = new System.Drawing.Point(8, 79);
+            this.ButtonAddMap.Name = "ButtonAddMap";
+            this.ButtonAddMap.Size = new System.Drawing.Size(174, 35);
+            this.ButtonAddMap.TabIndex = 2;
+            this.ButtonAddMap.Text = "Добавить карту";
+            this.ButtonAddMap.UseVisualStyleBackColor = true;
+            this.ButtonAddMap.Click += new System.EventHandler(this.ButtonAddMap_Click);
+            // 
+            // comboBoxSelectorMap
+            // 
+            this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxSelectorMap.FormattingEnabled = true;
+            this.comboBoxSelectorMap.Items.AddRange(new object[] {
+            "Первая карта",
+            "Вторая карта"});
+            this.comboBoxSelectorMap.Location = new System.Drawing.Point(7, 50);
+            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+            this.comboBoxSelectorMap.Size = new System.Drawing.Size(175, 23);
+            this.comboBoxSelectorMap.TabIndex = 0;
+            // 
             // maskedTextBoxPosition
             // 
-            this.maskedTextBoxPosition.Location = new System.Drawing.Point(17, 166);
+            this.maskedTextBoxPosition.Location = new System.Drawing.Point(15, 358);
             this.maskedTextBoxPosition.Mask = "00";
             this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
             this.maskedTextBoxPosition.Size = new System.Drawing.Size(175, 23);
@@ -75,7 +137,7 @@
             // 
             // buttonRemoveWarship
             // 
-            this.buttonRemoveWarship.Location = new System.Drawing.Point(17, 195);
+            this.buttonRemoveWarship.Location = new System.Drawing.Point(15, 387);
             this.buttonRemoveWarship.Name = "buttonRemoveWarship";
             this.buttonRemoveWarship.Size = new System.Drawing.Size(175, 35);
             this.buttonRemoveWarship.TabIndex = 3;
@@ -85,7 +147,7 @@
             // 
             // buttonShowStorage
             // 
-            this.buttonShowStorage.Location = new System.Drawing.Point(17, 287);
+            this.buttonShowStorage.Location = new System.Drawing.Point(15, 452);
             this.buttonShowStorage.Name = "buttonShowStorage";
             this.buttonShowStorage.Size = new System.Drawing.Size(175, 35);
             this.buttonShowStorage.TabIndex = 4;
@@ -98,7 +160,7 @@
             this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonDown.BackgroundImage = global::Warship.Properties.Resources.arrowDown;
             this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(91, 504);
+            this.buttonDown.Location = new System.Drawing.Point(91, 602);
             this.buttonDown.Name = "buttonDown";
             this.buttonDown.Size = new System.Drawing.Size(30, 30);
             this.buttonDown.TabIndex = 10;
@@ -110,7 +172,7 @@
             this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonRight.BackgroundImage = global::Warship.Properties.Resources.arrowRight;
             this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(127, 504);
+            this.buttonRight.Location = new System.Drawing.Point(127, 602);
             this.buttonRight.Name = "buttonRight";
             this.buttonRight.Size = new System.Drawing.Size(30, 30);
             this.buttonRight.TabIndex = 9;
@@ -122,7 +184,7 @@
             this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonLeft.BackgroundImage = global::Warship.Properties.Resources.arrowLeft;
             this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(55, 504);
+            this.buttonLeft.Location = new System.Drawing.Point(55, 602);
             this.buttonLeft.Name = "buttonLeft";
             this.buttonLeft.Size = new System.Drawing.Size(30, 30);
             this.buttonLeft.TabIndex = 8;
@@ -134,7 +196,7 @@
             this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonUp.BackgroundImage = global::Warship.Properties.Resources.arrowUp;
             this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(91, 468);
+            this.buttonUp.Location = new System.Drawing.Point(91, 566);
             this.buttonUp.Name = "buttonUp";
             this.buttonUp.Size = new System.Drawing.Size(30, 30);
             this.buttonUp.TabIndex = 7;
@@ -143,7 +205,7 @@
             // 
             // buttonShowOnMap
             // 
-            this.buttonShowOnMap.Location = new System.Drawing.Point(17, 391);
+            this.buttonShowOnMap.Location = new System.Drawing.Point(15, 493);
             this.buttonShowOnMap.Name = "buttonShowOnMap";
             this.buttonShowOnMap.Size = new System.Drawing.Size(175, 35);
             this.buttonShowOnMap.TabIndex = 5;
@@ -153,7 +215,7 @@
             // 
             // buttonAddWarship
             // 
-            this.buttonAddWarship.Location = new System.Drawing.Point(17, 106);
+            this.buttonAddWarship.Location = new System.Drawing.Point(15, 317);
             this.buttonAddWarship.Name = "buttonAddWarship";
             this.buttonAddWarship.Size = new System.Drawing.Size(175, 35);
             this.buttonAddWarship.TabIndex = 1;
@@ -161,39 +223,35 @@
             this.buttonAddWarship.UseVisualStyleBackColor = true;
             this.buttonAddWarship.Click += new System.EventHandler(this.ButtonAddWarship_Click);
             // 
-            // comboBoxSelectorMap
-            // 
-            this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxSelectorMap.FormattingEnabled = true;
-            this.comboBoxSelectorMap.Items.AddRange(new object[] {
-            "Первая карта",
-            "Вторая карта"});
-            this.comboBoxSelectorMap.Location = new System.Drawing.Point(17, 32);
-            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-            this.comboBoxSelectorMap.Size = new System.Drawing.Size(175, 23);
-            this.comboBoxSelectorMap.TabIndex = 0;
-            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
-            // 
             // pictureBox
             // 
             this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
             this.pictureBox.Location = new System.Drawing.Point(0, 0);
             this.pictureBox.Name = "pictureBox";
-            this.pictureBox.Size = new System.Drawing.Size(811, 554);
+            this.pictureBox.Size = new System.Drawing.Size(859, 652);
             this.pictureBox.TabIndex = 1;
             this.pictureBox.TabStop = false;
             // 
+            // textBoxMap
+            // 
+            this.textBoxMap.Location = new System.Drawing.Point(5, 21);
+            this.textBoxMap.Name = "textBoxMap";
+            this.textBoxMap.Size = new System.Drawing.Size(175, 23);
+            this.textBoxMap.TabIndex = 12;
+            // 
             // FormMapWithSetWarships
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1015, 554);
+            this.ClientSize = new System.Drawing.Size(1063, 652);
             this.Controls.Add(this.pictureBox);
             this.Controls.Add(this.groupBoxTools);
             this.Name = "FormMapWithSetWarships";
             this.Text = "Карта с набором объектов";
             this.groupBoxTools.ResumeLayout(false);
             this.groupBoxTools.PerformLayout();
+            this.groupBoxMaps.ResumeLayout(false);
+            this.groupBoxMaps.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
             this.ResumeLayout(false);
 
@@ -213,5 +271,10 @@
         private Button buttonShowStorage;
         private Button buttonRemoveWarship;
         private MaskedTextBox maskedTextBoxPosition;
+        private GroupBox groupBoxMaps;
+        private Button ButtonDeleteMap;
+        private ListBox listBoxMaps;
+        private Button ButtonAddMap;
+        private TextBox textBoxMap;
     }
 }

Warship/Warship/FormMapWithSetWarships.cs

@@ -12,40 +12,46 @@ namespace Warship
 {
     public partial class FormMapWithSetWarships : Form
     {
-        private MapWithSetWarshipsGeneric<DrawingObjectWarship, AbstractMap> _mapWarshipsCollectionGeneric;
+
+        private readonly Dictionary<string, AbstractMap> _mapDict = new()
+        {
+            {"Первая карта",new SimpleMap() },
+            {"Вторая карта",new SecondMap() }
+        };
+
+        private readonly MapsCollection _mapsCollection;
 
         public FormMapWithSetWarships()
         {
             InitializeComponent();
+            _mapsCollection = new MapsCollection(pictureBox.Width, pictureBox.Height);
+            comboBoxSelectorMap.Items.Clear();
+            foreach(var elem in _mapDict)
+            {
+                comboBoxSelectorMap.Items.Add(elem.Key);
+            }
         }
 
-        private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
+        private void ReloadMaps()
         {
-            AbstractMap map = null;
+            int index = listBoxMaps.SelectedIndex;
-
+            for (int i = 0; i < _mapsCollection.Keys.Count; i++)
-            switch (comboBoxSelectorMap.Text)
             {
-                case "Первая карта":
+                listBoxMaps.Items.Add(_mapsCollection.Keys[i]);
-                    map = new SimpleMap();
-                    break;
-                case "Вторая карта":
-                    map = new SecondMap();
-                    break;
             }
-            if (map != null)
+            if (listBoxMaps.Items.Count>0&& (index == -1 || index >= listBoxMaps.Items.Count))
             {
-                _mapWarshipsCollectionGeneric = new MapWithSetWarshipsGeneric<DrawingObjectWarship, AbstractMap>(
+                listBoxMaps.SelectedIndex = 0;
-                pictureBox.Width, pictureBox.Height, map);
             }
-            else
+            else if (listBoxMaps.Items.Count>0&&index>-1 && index < listBoxMaps.Items.Count)
             {
-                _mapWarshipsCollectionGeneric = null;
+                listBoxMaps.SelectedIndex = index;
             }
         }
 
         private void ButtonAddWarship_Click(object sender, EventArgs e)
         {
-            if (_mapWarshipsCollectionGeneric == null)
+            if (listBoxMaps.SelectedIndex==-1)
             {
                 return;
             }
@@ -53,10 +59,10 @@ namespace Warship
             if (form.ShowDialog() == DialogResult.OK)
             {
                 DrawingObjectWarship warship = new(form.SelectedWarship);
-                if (_mapWarshipsCollectionGeneric + warship>=0)
+                if (_mapsCollection[listBoxMaps.SelectedItem?.ToString()??string.Empty]+warship!=-1)
                 {
                     MessageBox.Show("Объект добавлен");
-                    pictureBox.Image = _mapWarshipsCollectionGeneric.ShowSet();
+                    pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
                 }
                 else
                 {
@@ -67,6 +73,10 @@ namespace Warship
 
         private void ButtonRemoveWarship_Click(object sender, EventArgs e)
         {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
             if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
             {
                 return;
@@ -76,10 +86,10 @@ namespace Warship
                 return;
             }
             int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-            if (_mapWarshipsCollectionGeneric - pos !=null)
+            if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos !=null)
             {
                 MessageBox.Show("Объект удален");
-                pictureBox.Image = _mapWarshipsCollectionGeneric.ShowSet();
+                pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
             }
             else
             {
@@ -89,25 +99,25 @@ namespace Warship
 
         private void ButtonShowStorage_Click(object sender, EventArgs e)
         {
-            if (_mapWarshipsCollectionGeneric == null)
+            if (listBoxMaps.SelectedIndex == -1)
             {
                 return;
             }
-            pictureBox.Image = _mapWarshipsCollectionGeneric.ShowSet();
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
         }
 
         private void ButtonShowOnMap_Click(object sender, EventArgs e)
         {
-            if (_mapWarshipsCollectionGeneric == null)
+            if (listBoxMaps.SelectedIndex == -1)
             {
                 return;
             }
-            pictureBox.Image = _mapWarshipsCollectionGeneric.ShowOnMap();
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowOnMap();
         }
 
         private void ButtonMove_Click(object sender, EventArgs e)
         {
-            if (_mapWarshipsCollectionGeneric == null)
+            if (listBoxMaps.SelectedIndex == -1)
             {
                 return;
             }
@@ -128,7 +138,43 @@ namespace Warship
                     dir = Direction.Right;
                     break;
             }
-            pictureBox.Image = _mapWarshipsCollectionGeneric.MoveObject(dir);
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].MoveObject(dir);
+        }
+
+        private void ButtonAddMap_Click(object sender, EventArgs e)
+        {
+            if (comboBoxSelectorMap.SelectedIndex == -1 || string.IsNullOrEmpty(textBoxMap.Text))
+            {
+                MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            if (!_mapDict.ContainsKey(comboBoxSelectorMap.Text))
+            {
+                MessageBox.Show("Нет такой карты", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            listBoxMaps.Items.Clear();
+            _mapsCollection.AddMap(textBoxMap.Text, _mapDict[comboBoxSelectorMap.Text]);
+            ReloadMaps();
+        }
+
+        private void ListBoxMaps_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+        }
+
+        private void ButtonDeleteMap_Click(object sender, EventArgs e)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            if (MessageBox.Show($"Удалить карту {listBoxMaps.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+            {
+                _mapsCollection.DelMap(listBoxMaps.SelectedItem?.ToString() ?? string.Empty);
+                listBoxMaps.Items.Clear();
+                ReloadMaps();
+            }
         }
     }
 }

Warship/Warship/MapWithSetWarshipsGeneric.cs

@@ -49,14 +49,10 @@ namespace Warship
         public Bitmap ShowOnMap()
         {
             Shaking();
-            for (int i = 0; i < _setWarship.Count; i++)
+            foreach(var warship in _setWarship.GetWarships())
-            {
-                var warship = _setWarship.Get(i);
-                if (warship != null)
             {
                 return _map.CreateMap(_pictureWidth, _pictureHeight, warship);
             }
-            }
             return new(_pictureWidth, _pictureHeight);
         }
 
@@ -74,11 +70,11 @@ namespace Warship
             int j = _setWarship.Count - 1;
             for (int i = 0; i < _setWarship.Count; i++)
             {
-                if (_setWarship.Get(i) == null)
+                if (_setWarship[i] == null)
                 {
                     for (; j > i; j--)
                     {
-                        var warship = _setWarship.Get(j);
+                        var warship = _setWarship[j];
                         if (warship != null)
                         {
                             _setWarship.Insert(warship, i);
@@ -113,14 +109,13 @@ namespace Warship
         {
             int width = _pictureWidth / _placeSizeWidth;
             int height = _pictureHeight / _placeSizeHeight;
+            int i= 0;
 
-            for (int i = 0; i < _setWarship.Count; i++)
+            foreach(var warship in _setWarship.GetWarships())
             {
-                if (_setWarship.Get(i) != null)
+                warship.SetObject(i % width * _placeSizeWidth, (height - 1 - i / width) * _placeSizeHeight, _pictureWidth, _pictureHeight);
-                {
+                warship.DrawingObject(gr);
-                    _setWarship.Get(i).SetObject(i % width * _placeSizeWidth, (height - 1 - i / width) * _placeSizeHeight, _pictureWidth, _pictureHeight);
+                i++;
-                    _setWarship.Get(i)?.DrawingObject(gr);
-                }
             }
         }
     }

Warship/Warship/MapsCollection.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Warship
+{
+    internal class MapsCollection
+    {
+        readonly Dictionary<string, MapWithSetWarshipsGeneric<DrawingObjectWarship, AbstractMap>> _mapStorages;
+
+        public List<string> Keys => _mapStorages.Keys.ToList();
+
+        private readonly int _pictureWidth;
+        private readonly int _pictureHeight;
+
+        public MapsCollection(int pictureWidth, int pictureHeight)
+        {
+            _mapStorages = new Dictionary<string, MapWithSetWarshipsGeneric<DrawingObjectWarship, AbstractMap>>();
+            _pictureWidth = pictureWidth;
+            _pictureHeight = pictureHeight;
+        }
+
+        public void AddMap(string name, AbstractMap map)
+        {
+            if (_mapStorages.ContainsKey(name))
+            {
+                MessageBox.Show("Карта уже существует");
+                return;
+            }
+            else
+            {
+                _mapStorages.Add(name, new MapWithSetWarshipsGeneric<DrawingObjectWarship, AbstractMap>(_pictureWidth, _pictureHeight, map));
+            }
+        }
+
+        public void DelMap(string name)
+        {
+
+                _mapStorages.Remove(name);
+
+        }
+
+        public MapWithSetWarshipsGeneric<DrawingObjectWarship, AbstractMap> this[string ind]
+        {
+            get
+            {
+                if (_mapStorages.ContainsKey(ind))
+                    return _mapStorages[ind];
+                return null;
+            }
+        }
+    }
+}

Warship/Warship/SetWarshipsGeneric.cs

@@ -9,69 +9,73 @@ namespace Warship
     internal class SetWarshipsGeneric<T>
         where T : class
     {
-        private readonly T[] _places;
+        private readonly List<T> _places;
 
-        public int Count => _places.Length;
+        public int Count => _places.Count;
+
+        private readonly int _maxCount;
 
         public SetWarshipsGeneric(int count)
         {
-            _places = new T[count];
+            _maxCount = count;
+            _places = new List<T>();
         }
 
         public int Insert(T warship)
         {
-            return Insert(warship,0);
+            if (_places.Count + 1 >= _maxCount)
+                return -1;
+            _places.Insert(0, warship);
+            return 0;
         }
         
         public int Insert(T warship, int position)
         {
-            int EmptyEl=-1;
+            if (position >= _maxCount || position < 0)
-
-            if (position>=Count || position < 0)
                 return -1;
-
+            if (_places.Count + 1 >= _maxCount)
-            if (_places[position] == null)
-            {
-                _places[position] = warship;
-                return 1;
-            }
-
-            else if (_places[position] != null)
-            {
-                for (int i = position + 1; i < Count; i++)
-                    if (_places[i] == null)
-                    {
-                        EmptyEl = i;
-                        break;
-                    }
-
-                if (EmptyEl == -1)
                 return -1;
-
+            _places.Insert(position, warship);
-                for (int i = EmptyEl; i > position; i--)
+            return position;
-                    _places[i] = _places[i - 1];
-            }
-
-            _places[position] = warship;
-            return 1;
         }
 
         public T Remove(int position)
         {
-            if (position >= Count || position < 0 || _places[position]==null)
+            if (position >= _maxCount || position < 0)
                 return null;
 
             T deleted =_places[position];
-            _places[position] = null;
+            _places.RemoveAt(position);
             return deleted;
         }
 
-        public T Get(int position)
+        public T this[int position]
         {
-            if (position >= Count || position < 0)
+            get
+            {
+                if (position < 0 || position >= _maxCount)
                     return null;
-
                 return _places[position];
             }
+            set
+            {
+                if (position < 0 || position >= _maxCount)
+                    Insert(value, position);
+            }
+        }
+        public IEnumerable<T> GetWarships()
+        {
+            foreach(var warship in _places)
+            {
+                if (warship != null)
+                {
+                    yield return warship;
+                }
+                else
+                {
+                    yield break;
+                }
+            }
+        }
     }
 }