ProjectExcavator/ProjectExcavator/CollectionGenericObjects/StorageCollection.cs

@@ -112,41 +112,38 @@ public class StorageCollection<T>
             File.Delete(filename);
         }
 
-        StringBuilder sb = new();
-
-        sb.Append(_collectionKey);
-        foreach (KeyValuePair<string, ICollectionGenericObjects<T>> value in _storages)
+        using (StreamWriter writer = new StreamWriter(filename))
         {
-            sb.Append(Environment.NewLine);
-            // не сохраняем пустые коллекции
-            if (value.Value.Count == 0)
+            writer.Write(_collectionKey);
+            foreach (KeyValuePair<string, ICollectionGenericObjects<T>> value in _storages)
             {
-                continue;
-            }
-
-            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())
-            {
-                string data = item?.GetDataForSave() ?? string.Empty;
-                if (string.IsNullOrEmpty(data))
+                writer.Write(Environment.NewLine);
+                // не сохраняем пустые коллекции
+                if (value.Value.Count == 0)
                 {
                     continue;
                 }
 
-                sb.Append(data);
-                sb.Append(_separatorItems);
+                writer.Write(value.Key);
+                writer.Write(_separatorForKeyValue);
+                writer.Write(value.Value.GetCollectionType);
+                writer.Write(_separatorForKeyValue);
+                writer.Write(value.Value.MaxCount);
+                writer.Write(_separatorForKeyValue);
+
+                foreach (T? item in value.Value.GetItems())
+                {
+                    string data = item?.GetDataForSave() ?? string.Empty;
+                    if (string.IsNullOrEmpty(data))
+                    {
+                        continue;
+                    }
+
+                    writer.Write(data);
+                    writer.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;
     }
 
@@ -162,62 +159,55 @@ public class StorageCollection<T>
             return false;
         }
 
-        string bufferTextFromFile = "";
-        using (FileStream fs = new(filename, FileMode.Open))
+        using (StreamReader reader = File.OpenText(filename))
         {
-            byte[] b = new byte[fs.Length];
-            UTF8Encoding temp = new(true);
-            while (fs.Read(b, 0, b.Length) > 0)
-            {
-                bufferTextFromFile += temp.GetString(b);
-            }
-        }
+            string str = reader.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 (str == null || str.Length == 0)
             {
                 return false;
             }
 
-            collection.MaxCount = Convert.ToInt32(record[2]);
-
-            string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
-            foreach (string elem in set)
+            if (!str.StartsWith(_collectionKey))
             {
-                if (elem?.CreateDrawningBulldozer() is T bulldozer)
-                {
-                    if (collection.Insert(bulldozer) == - 1)
-                    {
-                        return false;
-                    }
-                }
+                //если нет такой записи, то это не те данные
+                return false;
             }
 
-            _storages.Add(record[0], collection);
-        }
+            _storages.Clear();
+            string strs = "";
+            while ((strs = reader.ReadLine()) != null)
+            {
+                string[] record = strs.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)
+                {
+                    return false;
+                }
+
+                collection.MaxCount = Convert.ToInt32(record[2]);
+
+                string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
+                foreach (string elem in set)
+                {
+                    if (elem?.CreateDrawningBulldozer() is T bulldozer)
+                    {
+                        if (collection.Insert(bulldozer) == -1)
+                        {
+                            return false;
+                        }
+                    }
+                }
+
+                _storages.Add(record[0], collection);
+            }
+        }
         return true;
     }
 

ProjectExcavator/ProjectExcavator/Drawnings/DrawningBulldozer.cs

@@ -1,4 +1,5 @@
 using ProjectExcavator.Entities;
+using System.Security.Policy;
 
 namespace ProjectExcavator.Drawnings;
 
@@ -99,9 +100,9 @@ public class DrawningBulldozer
     /// Конструктор, принимающий объект EntityBulldozer в качестве параметра
     /// </summary>
     /// <param name="entityBulldozer"></param>
-    public DrawningBulldozer(EntityBulldozer entityBulldozer)
+    public DrawningBulldozer(EntityBulldozer bull) : this()
     {
-        EntityBulldozer = entityBulldozer;
+        EntityBulldozer = new EntityBulldozer(bull.Speed, bull.Weight, bull.BodyColor);
     }
 
     /// <summary>

ProjectExcavator/ProjectExcavator/Drawnings/DrawningExcavator.cs

@@ -25,9 +25,9 @@ public class DrawningExcavator : DrawningBulldozer
     /// Конструктор, принимающий объект EntityBulldozer в качестве параметра
     /// </summary>
     /// <param name="entityBulldozer"></param>
-    public DrawningExcavator(EntityBulldozer entityBulldozer)
+    public DrawningExcavator(EntityExcavator exc) : base(150, 80)
     {
-        EntityBulldozer = entityBulldozer;
+        EntityBulldozer = new EntityExcavator(exc.Speed, exc.Weight, exc.BodyColor, exc.AdditionalColor, exc.Prop, exc.Ladle);
     }
 
     public override void DrawTransport(Graphics g)

ProjectExcavator/ProjectExcavator/Drawnings/ExtentionDrawningBulldozer.cs

@@ -23,7 +23,7 @@ public static class ExtentionDrawningBulldozer
         EntityBulldozer? bulldozer = EntityExcavator.CreateEntityExcavator(strs);
         if (bulldozer != null)
         {
-            return new DrawningExcavator(bulldozer);
+            return new DrawningExcavator((EntityExcavator)bulldozer);
         }
 
         bulldozer = EntityBulldozer.CreateEntityBulldozer(strs);