ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/StorageCollection.cs

@@ -113,39 +113,40 @@ public class StorageCollection<T>
             File.Delete(filename);
         }
 
-        StringBuilder sb = new();
-
-        sb.Append(_collectionKey);
-        foreach (KeyValuePair<string, ICollectionGenericObjects<T>> value in _storages)
+        using (StreamWriter sw = new StreamWriter(filename))
         {
-            sb.Append(Environment.NewLine);
-            // не сохраняем пустые коллекции
-            if (value.Value.Count == 0)
-            {
-                continue;
-            }
+            sw.Write(_collectionKey);
 
-            sb.Append(value.Key);
-            sb.Append(_separatorForKeyValue);
-            sb.Append(value.Value.GetCollectionType);
-            sb.Append(_separatorForKeyValue);
-            sb.Append(value.Value.MaxCount);
-            sb.Append(_separatorForKeyValue);
-
-            foreach (T? item in value.Value.GetItems())
+            foreach (KeyValuePair<string, ICollectionGenericObjects<T>> value in _storages)
             {
-                string data = item?.GetDataForSave() ?? string.Empty;
-                if (string.IsNullOrEmpty(data))
+                sw.Write(Environment.NewLine);
+                // не сохраняем пустые коллекции
+                if (value.Value.Count == 0)
                 {
                     continue;
                 }
-                sb.Append(data);
-                sb.Append(_separatorItems);
+
+                sw.Write(value.Key);
+                sw.Write(_separatorForKeyValue);
+                sw.Write(value.Value.GetCollectionType);
+                sw.Write(_separatorForKeyValue);
+                sw.Write(value.Value.MaxCount);
+                sw.Write(_separatorForKeyValue);
+
+                foreach (T? item in value.Value.GetItems())
+                {
+                    string data = item?.GetDataForSave() ?? string.Empty;
+
+                    if (string.IsNullOrEmpty(data))
+                    {
+                        continue;
+                    }
+                    sw.Write(data);
+                    sw.Write(_separatorItems);
+                }
             }
         }
-        using FileStream fs = new(filename, FileMode.Create);
-        byte[] info = new UTF8Encoding(true).GetBytes(sb.ToString());
-        fs.Write(info, 0, info.Length);
+
         return true;
     }
 
@@ -161,62 +162,52 @@ public class StorageCollection<T>
             return false;
         }
 
-        string bufferTextFromFile = "";
-        using (FileStream fs = new(filename, FileMode.Open))
+        using (StreamReader sr = new(filename))
         {
-            byte[] b = new byte[fs.Length];
-            UTF8Encoding temp = new(true);
-            while (fs.Read(b, 0, b.Length) > 0)
-            {
-                bufferTextFromFile += temp.GetString(b);
-            }
-        }
+            string line = sr.ReadLine();
 
-        string[] strs = bufferTextFromFile.Split(new char[] { '\n', '\r' },
-        StringSplitOptions.RemoveEmptyEntries);
-        if (strs == null || strs.Length == 0)
-        {
-            return false;
-        }
-
-        if (!strs[0].Equals(_collectionKey))
-        {
-            //если нет такой записи, то это не те данные
-            return false;
-        }
-
-        _storages.Clear();
-        foreach (string data in strs)
-        {
-            string[] record = data.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
-            if (record.Length != 4)
-            {
-                continue;
-            }
-
-            CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]);
-            ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionType);
-            if (collection == null)
+            if (line == null || line.Length == 0)
             {
                 return false;
             }
-
-            collection.MaxCount = Convert.ToInt32(record[2]);
-
-            string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
-            foreach (string elem in set)
+            if (!line.Equals(_collectionKey))
             {
-                if (elem?.CreateDrawningWarship() is T warship)
+                //если нет такой записи, то это не те данные
+                return false;
+            }
+            _storages.Clear();
+
+            while ((line = sr.ReadLine()) != null)
+            {
+                string[] record = line.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
+                if (record.Length != 4)
                 {
-                    if (collection.Insert(warship) == -1)
+                    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?.CreateDrawningWarship() is T warship)
                     {
-                        return false;
+                        if (collection.Insert(warship) == -1)
+                        {
+                            return false;
+                        }
                     }
                 }
+                _storages.Add(record[0], collection);
             }
-
-            _storages.Add(record[0], collection);
         }
+
         return true;
     }
 

ProjectAircraftCarrier_/ProjectAircraftCarrier_/Drawnings/DrawningAircraftCarrier.cs

@@ -17,9 +17,20 @@ public class DrawningAircraftCarrier : DrawningWarship
     /// <param name="deckForAircraftTakeOff">Палуба для взлета самолетов</param>
     /// <param name="controlCabin">Рубка управления</param>
     /// <param name="fighterJet">Истребитель</param>
-    public DrawningAircraftCarrier(int speed, double weight, Color bodyColor, Color additionalColor, bool deckForAircraftTakeOff, bool controlCabin, bool fighterJet) : base(140, 50)
+    public DrawningAircraftCarrier(int speed, double weight, Color bodyColor, Color additionalColor, 
+        bool deckForAircraftTakeOff, bool controlCabin, bool fighterJet) : base(140, 50)
     {
-        EntityWarship = new EntityAircraftCarrier(speed, weight, bodyColor, additionalColor, deckForAircraftTakeOff, controlCabin, fighterJet);
+        EntityWarship = new EntityAircraftCarrier(speed, weight, bodyColor, additionalColor, 
+            deckForAircraftTakeOff, controlCabin, fighterJet);
+    }
+
+    /// <summary>
+    /// Конструктор для класса Extention
+    /// </summary>
+    /// <param name="airplan"></param>
+    public DrawningAircraftCarrier(EntityWarship? aircraftCarrier) : base(aircraftCarrier)
+    {
+        EntityWarship = aircraftCarrier;
     }
 
     public override void DrawTransport(Graphics g)

ProjectAircraftCarrier_/ProjectAircraftCarrier_/Drawnings/DrawningWarship.cs

@@ -95,6 +95,15 @@ public class DrawningWarship
         _drawningWarshipHeight = DrawningWarshiprierHeight;
     }
 
+    /// <summary>
+    /// Конструктор для класса Extention
+    /// </summary>
+    /// <param name="warship"></param>
+    public DrawningWarship(EntityWarship? warship) : this()
+    {
+        EntityWarship = warship;
+    }
+
     /// <summary>
     /// Установка границ поля
     /// </summary>

ProjectAircraftCarrier_/ProjectAircraftCarrier_/Drawnings/ExtentionDrawningWarship.cs

@@ -24,15 +24,13 @@ public static class ExtentionDrawningWarship
         EntityWarship? warship = EntityAircraftCarrier.CreateEntityAircraftCarrier(strs);
         if (warship != null)
         {
-            return new DrawningAircraftCarrier(warship.Speed, warship.Weight, warship.BodyColor, 
-                (warship as EntityAircraftCarrier).AdditionalColor, (warship as EntityAircraftCarrier).DeckForAircraftTakeOff, 
-                (warship as EntityAircraftCarrier).ControlCabin, (warship as EntityAircraftCarrier).FighterJet);
+            return new DrawningAircraftCarrier(warship);
         }
 
         warship = EntityWarship.CreateEntityWarship(strs);
         if (warship != null)
         {
-            return new DrawningWarship(warship.Speed, warship.Weight, warship.BodyColor);
+            return new DrawningWarship(warship);
         }
 
         return null;

ProjectAircraftCarrier_/ProjectAircraftCarrier_/WarshipDelegate.cs

@@ -1,9 +0,0 @@
-using ProjectAircraftCarrier_.Drawnings;
-
-namespace ProjectAircraftCarrier_;
-
-/// <summary>
-/// Делегат передачи объекта класса-прорисовки
-/// </summary>
-/// <param name="warship"></param>
-public delegate void WarshipDelegate(DrawningWarship warship);