ElectricLocomotive/FormLocomotiveCollection.cs

@@ -24,11 +24,6 @@ namespace ProjectElectricLocomotive
             ButtonRefreshCollection_Click(sender, e);
         }
 
-        private void listBoxStorages_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            ListBoxObjects_SelectedIndexChanged(sender, e);
-        }
-
         private void buttonAddObject_Click(object sender, EventArgs e)
         {
             ButtonAddObject_Click(sender, e);
@@ -38,5 +33,10 @@ namespace ProjectElectricLocomotive
         {
             ButtonDelObject_Click(sender, e);
         }
+
+        private void listBoxStorages_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            ListBoxObjects_SelectedIndexChanged(sender, e);
+        }
     }
 }

ElectricLocomotive/LogicFormLocomotiveCollection.cs

@@ -98,6 +98,73 @@ namespace ProjectElectricLocomotive
             }
         }
 
+        /// <summary>
+        /// Заполнение listBoxObjects
+        /// </summary>
+        private void ReloadObjects()
+        {
+            int index = listBoxStorages.SelectedIndex;
+            listBoxStorages.Items.Clear();
+            for (int i = 0; i < _storage.Keys.Count; i++)
+            {
+                listBoxStorages.Items.Add(_storage.Keys[i]);
+            }
+            if (listBoxStorages.Items.Count > 0 && (index == -1 || index >= listBoxStorages.Items.Count))
+            {
+                listBoxStorages.SelectedIndex = 0;
+            }
+            else if (listBoxStorages.Items.Count > 0 && index > -1 &&
+            index < listBoxStorages.Items.Count)
+            {
+                listBoxStorages.SelectedIndex = index;
+            }
+        }
+        /// <summary>
+        /// Добавление набора в коллекцию
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonAddObject_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(textBoxStorageName.Text))
+            {
+                MessageBox.Show("Не все данные заполнены", "Ошибка",
+                MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            _storage.AddSet(textBoxStorageName.Text);
+            ReloadObjects();
+        }
+
+        /// <summary>
+        /// Выбор набора
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ListBoxObjects_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            pictureBoxCollection.Image = _storage[listBoxStorages.SelectedItem?.ToString() ?? string.Empty]?.ShowLocomotives();
+        }
+        /// <summary>
+        /// Удаление набора
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonDelObject_Click(object sender, EventArgs e)
+        {
+            if (listBoxStorages.SelectedIndex == -1)
+            {
+                return;
+            }
+            if (MessageBox.Show($"Удалить объект {listBoxStorages.SelectedItem}?",
+                "Удаление", MessageBoxButtons.YesNo,
+                MessageBoxIcon.Question) == DialogResult.Yes)
+            {
+                _storage.DelSet(listBoxStorages.SelectedItem.ToString() ?? string.Empty);
+                ReloadObjects();
+            }
+        }
+
         /// <summary>
         /// Добавление объекта в набор
         /// </summary>
@@ -174,7 +241,10 @@ namespace ProjectElectricLocomotive
                 return;
             }
             var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
-
+            if (obj == null)
+            {
+                return;
+            }
             pictureBoxCollection.Image = obj.ShowLocomotives();
         }
     }