изменения

Excavator/Excavator/CollectionGenericObjects/StorageCollection.cs

@@ -34,18 +34,16 @@ public class StorageCollection<T>
     /// <param name="collectionType">тип коллекции</param>
     public void AddCollection(string name, CollectionType collectionType)
     {
-        if (name == null || _storages.ContainsKey(name)) { return; }
+        if (string.IsNullOrEmpty(name)) return;
-        switch (collectionType)
+        if (_storages.ContainsKey(name)) return;
-
+        if (collectionType == CollectionType.None) return;
+        if (collectionType == CollectionType.Massive)
         {
-            case CollectionType.None:
+            _storages[name] = new MassiveGenericObjects<T>();
-                return;
+        }
-            case CollectionType.Massive:
+        else if (collectionType == CollectionType.List)
-                _storages[name] = new MassiveGenericObjects<T>();
+        {
-                return;
+            _storages[name] = new ListGenericObjects<T>();
-            case CollectionType.List:
-                _storages[name] = new ListGenericObjects<T>();
-                return;
         }
     }
 
@@ -97,28 +95,31 @@ public class StorageCollection<T>
         {
             return false;
         }
+
         if (File.Exists(filename))
         {
             File.Delete(filename);
         }
+
         using (StreamWriter writer = new StreamWriter(filename))
         {
             writer.Write(_collectionKey);
             foreach (KeyValuePair<string, ICollectionGenericObjects<T>> value in _storages)
             {
-                StringBuilder sb = new();
+                writer.Write(Environment.NewLine);
-                sb.Append(Environment.NewLine);
+                // не сохраняем пустые коллекции
-
                 if (value.Value.Count == 0)
                 {
                     continue;
                 }
-                sb.Append(value.Key);
+
-                sb.Append(_separatorForKeyValue);
+                writer.Write(value.Key);
-                sb.Append(value.Value.GetCollectionType);
+                writer.Write(_separatorForKeyValue);
-                sb.Append(_separatorForKeyValue);
+                writer.Write(value.Value.GetCollectionType);
-                sb.Append(value.Value.MaxCount);
+                writer.Write(_separatorForKeyValue);
-                sb.Append(_separatorForKeyValue);
+                writer.Write(value.Value.MaxCount);
+                writer.Write(_separatorForKeyValue);
+
                 foreach (T? item in value.Value.GetItems())
                 {
                     string data = item?.GetDataForSave() ?? string.Empty;
@@ -126,12 +127,11 @@ public class StorageCollection<T>
                     {
                         continue;
                     }
-                    sb.Append(data);
-                    sb.Append(_separatorItems);
-                }
-                writer.Write(sb);
-            }
 
+                    writer.Write(data);
+                    writer.Write(_separatorItems);
+                }
+            }
         }
 
         return true;
@@ -147,9 +147,10 @@ public class StorageCollection<T>
         {
             return false;
         }
-        using (StreamReader fs = File.OpenText(filename))
+
+        using (StreamReader reader = File.OpenText(filename))
         {
-            string str = fs.ReadLine();
+            string? str = reader.ReadLine();
             if (str == null || str.Length == 0)
             {
                 return false;
@@ -159,31 +160,31 @@ public class StorageCollection<T>
                 return false;
             }
             _storages.Clear();
-            string strs = "";
+            string? strs = "";
-            while ((strs = fs.ReadLine()) != null)
+
+            while ((strs = reader.ReadLine()) != null)
             {
-                if (strs == null)
-                {
-                    return false;
-                }
                 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?.CreateDrawningTrackedVehicle() is T locomotive)
+                    if (elem?.CreateDrawningTrackedVehicle() is T ship)
                     {
-                        if (collection.Insert(locomotive) == -1)
+                        if (collection.Insert(ship) == -1)
                         {
                             return false;
                         }
@@ -191,6 +192,7 @@ public class StorageCollection<T>
                 }
                 _storages.Add(record[0], collection);
             }
+
             return true;
         }
     }

Excavator/Excavator/Drawnings/DrawningTrackedVehicle.cs

@@ -107,9 +107,9 @@ public class DrawningTrackedVehicle
       
     }
 
-    public DrawningTrackedVehicle(EntityTrackedVehicle car)
+    public DrawningTrackedVehicle(EntityTrackedVehicle car) : this() 
     {
-        this.car = car;
+        EntityTrackedVehicle = car;
     }
 
 

Excavator/Excavator/Drawnings/ExtentionDrawningTrackedVehicle.cs

@@ -22,7 +22,7 @@ public static class ExtentionDrawningTrackedVehicle
         {
             return new DrawningExcavator(car);
         }
-        car = EntityExcavator.CreateEntityExcavator(strs);
+        car = EntityTrackedVehicle.CreateEntityTrackedVehicle(strs);
         if (car != null)
         {
             return new DrawningTrackedVehicle(car);

Excavator/Excavator/Entities/EntityTrackedVehicle.cs

@@ -59,7 +59,7 @@ public class EntityTrackedVehicle
     /// </summary>
     /// <param name="strs"></param>
     /// <returns></returns>
-    public static EntityTrackedVehicle? CreateEntityShip(string[] strs)
+    public static EntityTrackedVehicle? CreateEntityTrackedVehicle(string[] strs)
     {
         if (strs.Length != 4 || strs[0] != nameof(EntityTrackedVehicle))
         {
@@ -68,5 +68,5 @@ public class EntityTrackedVehicle
         return new EntityTrackedVehicle(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]));
     }
 
- 
+   
 }