готова к сдаче

ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/AbstractCompany.cs

@@ -47,7 +47,7 @@ public abstract class AbstractCompany
         _pictureWidth = picWidth;
         _pictureHeight = picHeight;
         _collection = collection;
-        _collection.SetMaxCount = GetMaxCount;
+        _collection.MaxCount = GetMaxCount;
     }
 
     /// <summary>

ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -12,7 +12,7 @@ public interface ICollectionGenericObjects <T>
     /// <summary>
     /// Установка макс кол-ва элементов
     /// </summary>
-    int SetMaxCount { set; }
+    int MaxCount { get; set; }
 
     /// <summary>
     /// Добавление объекта в коллекцию
@@ -42,4 +42,15 @@ public interface ICollectionGenericObjects <T>
     /// /// <param name="obj">Добавляемый объект</param>
     /// <returns>Объект</returns>
     T? Get(int position);
+
+    /// <summary>
+    /// Получение типа коллекции
+    /// </summary>
+    CollectionType GetCollectionType { get; }
+
+    /// <summary>
+    /// Получение объектов коллекции по одному
+    /// </summary>
+    /// <returns>Поэлементый вывод элементов коллекции</returns>
+    IEnumerable<T?> GetItems();
 }

ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/ListGenericObjects.cs

@@ -25,7 +25,19 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
 
     public int Count => _collection.Count;
 
-    public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } }
+    public int MaxCount
+    {
+        get => _maxCount;
+        set
+        {
+            if (value > 0)
+            {
+                _maxCount = value;
+            }
+        }
+    }
+
+    public CollectionType GetCollectionType => CollectionType.List;
 
     /// <summary>
     /// Конструктор
@@ -75,4 +87,12 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
         return obj;
     }
 
+    public IEnumerable<T?> GetItems()
+    {
+        for (int i = 0; i < _collection.Count; ++i)
+        {
+            yield return _collection[i];
+        }
+    }
+
 }

ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -14,8 +14,12 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
 
     public int Count => _collection.Length;
 
-    public int SetMaxCount
+    public int MaxCount
     {
+        get
+        {
+            return _collection.Length;
+        }
         set
         {
             if (value > 0)
@@ -32,6 +36,8 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
         }
     }
 
+    public CollectionType GetCollectionType => CollectionType.Massive;
+
     /// <summary>
     /// Конструктор
     /// </summary>
@@ -97,4 +103,12 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
         _collection[position] = null;
         return obj;
     }
+
+    public IEnumerable<T?> GetItems()
+    {
+        for (int i = 0; i < _collection.Length; ++i)
+        {
+            yield return _collection[i];
+        }
+    }
 }

ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/StorageCollection.cs

@@ -1,4 +1,5 @@
-using System;
+using ProjectContainerShip.Drawnings;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -11,7 +12,7 @@ namespace ProjectContainerShip.CollectionGenericObjects;
 /// </summary>
 /// <typeparam name="T"></typeparam>
 public class StorageCollection<T>
-    where T : class
+    where T : DrawningShip
 {
     /// <summary>
 	/// Словарь (хранилище) с коллекциями
@@ -24,6 +25,22 @@ public class StorageCollection<T>
     /// </summary>
     public List<string> Keys => _storages.Keys.ToList();
 
+    /// <summary>
+    /// Ключевое слово, с которого должен начинаться файл
+    /// </summary>
+    private readonly string _collectionKey = "CollectionsStorage";
+
+    /// <summary>
+    /// Разделитель для записи ключа и значения элемента словаря
+    /// </summary>
+    private readonly string _separatorForKeyValue = "|";
+
+    /// <summary>
+    /// Разделитель для записей коллекции данных в файл
+    /// </summary>
+    private readonly string _separatorItems = ";";
+
+
     /// <summary>
     /// Конструктор
     /// </summary>
@@ -86,4 +103,119 @@ public class StorageCollection<T>
             return null;
         }
     }
+
+    /// <summary>
+	/// Сохранение информации по автомобилям в хранилище в файл
+	/// </summary>
+	/// <param name="filename">Путь и имя файла</param>
+	/// <returns>true - сохранение прошло успешно, false - ошибка при сохранении данных</returns>
+    public bool SaveData(string filename)
+    {
+        if (_storages.Count == 0)
+        {
+            return false;
+        }
+
+        if (File.Exists(filename))
+        {
+            File.Delete(filename);
+        }
+
+        StringBuilder sb = new();
+
+        using (StreamWriter sw = new StreamWriter(filename))
+        {
+            sw.WriteLine(_collectionKey.ToString());
+            foreach (KeyValuePair<string, ICollectionGenericObjects<T>> kvpair in _storages)
+            {
+                // не сохраняем пустые коллекции
+                if (kvpair.Value.Count == 0)
+                    continue;
+                sb.Append(kvpair.Key);
+                sb.Append(_separatorForKeyValue);
+                sb.Append(kvpair.Value.GetCollectionType);
+                sb.Append(_separatorForKeyValue);
+                sb.Append(kvpair.Value.MaxCount);
+                sb.Append(_separatorForKeyValue);
+                foreach (T? item in kvpair.Value.GetItems())
+                {
+                    string data = item?.GetDataForSave() ?? string.Empty;
+                    if (string.IsNullOrEmpty(data))
+                        continue;
+                    sb.Append(data);
+                    sb.Append(_separatorItems);
+                }
+                sw.WriteLine(sb.ToString());
+                sb.Clear();
+            }
+        }
+        return true;
+    }
+
+    /// <summary>
+	/// Загрузка информации по автомобилям в хранилище из файла
+	/// </summary>
+	/// <param name="filename">Путь и имя файла</param>
+	/// <returns>true - загрузка прошла успешно, false - ошибка при загрузке данных</returns>
+	public bool LoadData(string filename)
+    {
+        if (!File.Exists(filename))
+        {
+            return false;
+        }
+
+        using (StreamReader sr = new StreamReader(filename))
+        {
+            string? str;
+            str = sr.ReadLine();
+            if (str != _collectionKey.ToString())
+                return false;
+            _storages.Clear();
+            while ((str = sr.ReadLine()) != null)
+            {
+                string[] record = str.Split(_separatorForKeyValue);
+                if (record.Length != 4)
+                {
+                    continue;
+                }
+                CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]);
+                ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionType);
+                if (collection == null)
+                {
+                    return false;
+                }
+
+                collection.MaxCount = Convert.ToInt32(record[2]);
+
+                string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
+                foreach (string elem in set)
+                {
+                    if (elem?.CreateDrawningShip() is T boat)
+                    {
+                        if (collection.Insert(boat) == -1)
+                            return false;
+                    }
+                }
+                _storages.Add(record[0], collection);
+            }
+        }
+
+        return true;
+    }
+
+    /// <summary>
+	/// Создание коллекции по типу
+	/// </summary>
+	/// <param name="collectionType"></param>
+	/// <returns></returns>
+	private static ICollectionGenericObjects<T>? CreateCollection(CollectionType collectionType)
+    {
+        return collectionType switch
+        {
+            CollectionType.Massive => new MassiveGenericObjects<T>(),
+            CollectionType.List => new ListGenericObjects<T>(),
+            _ => null,
+        };
+    }
+
 }

ProjectContainerShip/ProjectContainerShip/Drawnings/DrawningContainerShip.cs

@@ -22,6 +22,16 @@ public class DrawningContainerShip : DrawningShip
             EntityShip = new EntityContainerShip(speed, weight, bodyColor, additionalColor, crane, container);
     }
     /// <returns>true - объект создан, false - проверка не пройдена, нельзя создать объект в этих размерах</returns>
+
+    /// <summary>
+    /// Конструктор через сущность
+    /// </summary>
+    /// <param name="ship">Объект класса-сущность</param>
+    public DrawningContainerShip(EntityShip entityShip) : base()
+    {
+        EntityShip = entityShip;
+    }
+
     public override void DrawTransport(Graphics g) 
     {
         if (EntityShip == null || EntityShip is not EntityContainerShip containerShip || !_startPosX.HasValue || !_startPosY.HasValue)

ProjectContainerShip/ProjectContainerShip/Drawnings/DrawningShip.cs

@@ -66,7 +66,7 @@ public class DrawningShip
     /// <summary>
     /// Пустой конструктор
     /// </summary>
-    private DrawningShip()
+    protected DrawningShip()
     {
         _pictureWidth = null;
         _pictureHeight = null;
@@ -96,6 +96,15 @@ public class DrawningShip
         _pictureHeight = drawningShipHeight;
     }
 
+    /// <summary>
+    /// Конструктор через сущность
+    /// </summary>
+    /// <param name="ship">Объект класса-сущность</param>
+    public DrawningShip(EntityShip entityShip) : base()
+    {
+        EntityShip = entityShip;
+    }
+
     /// <summary>
 	/// Установка границ поля
 	/// </summary>

ProjectContainerShip/ProjectContainerShip/Drawnings/ExtentionDrawningShip.cs

@@ -0,0 +1,51 @@
+using ProjectContainerShip.Entities;
+
+namespace ProjectContainerShip.Drawnings;
+
+public static class ExtentionDrawningShip
+{
+    /// <summary>
+	/// Разделитель для записи информации по объекту в файл
+	/// </summary>
+	private static readonly string _separatorForObject = ":";
+
+    /// <summary>
+    /// Создание объекта из строки
+    /// </summary>
+    /// <param name="info">Строка с данными для создания объекта</param>
+    /// <returns>Объект</returns>
+    public static DrawningShip? CreateDrawningShip(this string info)
+    {
+        string[] strs = info.Split(_separatorForObject);
+        EntityShip? ship = EntityContainerShip.CreateEntityContainerShip(strs);
+        if (ship != null)
+        {
+            return new DrawningContainerShip(ship);
+        }
+
+        ship = EntityShip.CreateEntityShip(strs);
+        if (ship != null)
+        {
+            return new DrawningShip(ship);
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    /// Получение данных для сохранения в файл
+    /// </summary>
+    /// <param name="drawningShip">Сохраняемый объект</param>
+    /// <returns>Строка с данными по объекту</returns>
+    public static string GetDataForSave(this DrawningShip drawningShip)
+    {
+        string[]? array = drawningShip?.EntityShip?.GetStringRepresentation();
+
+        if (array == null)
+        {
+            return string.Empty;
+        }
+
+        return string.Join(_separatorForObject, array);
+    }
+}

ProjectContainerShip/ProjectContainerShip/Entities/EntityContainerShip.cs

@@ -37,4 +37,28 @@ public class EntityContainerShip : EntityShip
         Crane = crane;
         Container = container;
     }
+
+    /// <summary>
+    /// Получение строк со значениями свойств объекта класса-сущности
+    /// </summary>
+    /// <returns></returns>
+    public override string[] GetStringRepresentation()
+    {
+        return new[] { nameof(EntityContainerShip), Speed.ToString(), Weight.ToString(), BodyColor.Name, AdditionalColor.Name, Crane.ToString(), Container.ToString() };
+    }
+
+    /// <summary>
+    /// Создание объекта из массива строк
+    /// </summary>
+    /// <param name="strs"></param>
+    /// <returns></returns>
+    public static EntityContainerShip? CreateEntityContainerShip(string[] strs)
+    {
+        if (strs.Length != 7 || strs[0] != nameof(EntityContainerShip))
+        {
+            return null;
+        }
+        return new EntityContainerShip(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]),
+            Color.FromName(strs[3]), Color.FromName(strs[4]), Convert.ToBoolean(strs[5]), Convert.ToBoolean(strs[6]));
+    }
 }

ProjectContainerShip/ProjectContainerShip/Entities/EntityShip.cs

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

ProjectContainerShip/ProjectContainerShip/FormShipCollection.Designer.cs

@@ -46,10 +46,17 @@
             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
@@ -59,9 +66,9 @@
             groupBoxTools.Controls.Add(panelStorage);
             groupBoxTools.Controls.Add(comboBoxSelectorCompany);
             groupBoxTools.Dock = DockStyle.Right;
-            groupBoxTools.Location = new Point(930, 0);
+            groupBoxTools.Location = new Point(935, 25);
             groupBoxTools.Name = "groupBoxTools";
-            groupBoxTools.Size = new Size(206, 638);
+            groupBoxTools.Size = new Size(206, 644);
             groupBoxTools.TabIndex = 0;
             groupBoxTools.TabStop = false;
             groupBoxTools.Text = "Инструменты";
@@ -242,19 +249,62 @@
             // pictureBox
             // 
             pictureBox.Dock = DockStyle.Fill;
-            pictureBox.Location = new Point(0, 0);
+            pictureBox.Location = new Point(0, 25);
             pictureBox.Name = "pictureBox";
-            pictureBox.Size = new Size(930, 638);
+            pictureBox.Size = new Size(935, 644);
             pictureBox.TabIndex = 1;
             pictureBox.TabStop = false;
             // 
+            // menuStrip
+            // 
+            menuStrip.Items.AddRange(new ToolStripItem[] { файлToolStripMenuItem });
+            menuStrip.Location = new Point(0, 0);
+            menuStrip.Name = "menuStrip";
+            menuStrip.Size = new Size(1141, 25);
+            menuStrip.TabIndex = 2;
+            menuStrip.Text = "menuStrip";
+            // 
+            // файлToolStripMenuItem
+            // 
+            файлToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { saveToolStripMenuItem, loadToolStripMenuItem });
+            файлToolStripMenuItem.Name = "файлToolStripMenuItem";
+            файлToolStripMenuItem.Size = new Size(50, 21);
+            файлToolStripMenuItem.Text = "Файл";
+            // 
+            // saveToolStripMenuItem
+            // 
+            saveToolStripMenuItem.Name = "saveToolStripMenuItem";
+            saveToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.S;
+            saveToolStripMenuItem.Size = new Size(192, 22);
+            saveToolStripMenuItem.Text = "Сохранение";
+            saveToolStripMenuItem.Click += saveToolStripMenuItem_Click;
+            // 
+            // loadToolStripMenuItem
+            // 
+            loadToolStripMenuItem.Name = "loadToolStripMenuItem";
+            loadToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.L;
+            loadToolStripMenuItem.Size = new Size(192, 22);
+            loadToolStripMenuItem.Text = "Загрузка";
+            loadToolStripMenuItem.Click += loadToolStripMenuItem_Click;
+            // 
+            // saveFileDialog
+            // 
+            saveFileDialog.Filter = "txt file | *.txt";
+            // 
+            // openFileDialog
+            // 
+            openFileDialog.FileName = "openFileDialog1";
+            openFileDialog.Filter = "txt file | *.txt";
+            // 
             // FormShipCollection
             // 
             AutoScaleDimensions = new SizeF(7F, 17F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(1136, 638);
+            ClientSize = new Size(1141, 669);
             Controls.Add(pictureBox);
             Controls.Add(groupBoxTools);
+            Controls.Add(menuStrip);
+            MainMenuStrip = menuStrip;
             Name = "FormShipCollection";
             Text = "Коллекция кораблей";
             groupBoxTools.ResumeLayout(false);
@@ -263,7 +313,10 @@
             panelStorage.ResumeLayout(false);
             panelStorage.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
+            menuStrip.ResumeLayout(false);
+            menuStrip.PerformLayout();
             ResumeLayout(false);
+            PerformLayout();
         }
 
         #endregion
@@ -286,5 +339,11 @@
         private ListBox listBoxCollection;
         private Button buttonCollectionAdd;
         private Panel panelCompanyTools;
+        private MenuStrip menuStrip;
+        private ToolStripMenuItem файлToolStripMenuItem;
+        private ToolStripMenuItem saveToolStripMenuItem;
+        private ToolStripMenuItem loadToolStripMenuItem;
+        private SaveFileDialog saveFileDialog;
+        private OpenFileDialog openFileDialog;
     }
 }

ProjectContainerShip/ProjectContainerShip/FormShipCollection.cs

@@ -1,5 +1,6 @@
 using ProjectContainerShip.CollectionGenericObjects;
 using ProjectContainerShip.Drawnings;
+using System.Windows.Forms;
 
 
 namespace ProjectContainerShip
@@ -245,5 +246,46 @@ namespace ProjectContainerShip
             panelCompanyTools.Enabled = true;
             RefreshListBoxItems();
         }
+
+        /// <summary>
+        /// Обработка нажатия "Сохранение"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void saveToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (saveFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                if (_storageCollection.SaveData(saveFileDialog.FileName))
+                {
+                    MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                }
+                else
+                {
+                    MessageBox.Show("Не сохранилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Обработка кнопки загрузки
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void loadToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (openFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                if (_storageCollection.LoadData(openFileDialog.FileName))
+                {
+                    RefreshListBoxItems();
+                    MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                }
+                else
+                {
+                    MessageBox.Show("Загрузка не выполнена", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
+            }
+        }
     }
 }

ProjectContainerShip/ProjectContainerShip/FormShipCollection.resx

@@ -117,6 +117,15 @@
   <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>131, 17</value>
+  </metadata>
+  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>276, 17</value>
+  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>79</value>
   </metadata>