6 лаба итог

FileWithSave.txt

@@ -0,0 +1,5 @@
+MapsCollection
+were|SimpleMap|100:100:Lime;
+ert4rg|SimpleMap|100:100:Red;100:100:Fuchsia:Yellow:True:True:True;
+32e32|SecondMap|100:100:Lime:Fuchsia:True:True:False;100:100:Cyan:Cyan:False:False:True;100:100:Red:Yellow:True:True:True;
+fdgwdf|SecondMap|

Warship/Warship/FormMapWithSetWarships.cs

@@ -200,8 +200,8 @@ namespace Warship
             {
                 if (_mapsCollection.LoadData(OpenFileDialog.FileName))
                 {
-                    ReloadMaps();
                     MessageBox.Show("Загрузка прошла успешно!", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    ReloadMaps();
                 }
                 else
                 {

Warship/Warship/MapsCollection.cs

@@ -25,24 +25,18 @@ namespace Warship
             _pictureHeight = pictureHeight;
         }
 
-        private static void WriteToFile(string text,FileStream stream)
-        {
-            byte[] info = new UTF8Encoding(true).GetBytes(text);
-            stream.Write(info, 0, info.Length);
-        }
-
         public bool SaveData(string filename)
         {
             if (File.Exists(filename))
             {
                 File.Delete(filename);
             }
-            using (FileStream fs = new(filename, FileMode.Create))
+            using (StreamWriter sw = new(filename))
             {
-                WriteToFile($"MapsCollection{Environment.NewLine}", fs);
+                sw.Write($"MapsCollection{Environment.NewLine}");
                 foreach (var storage in _mapStorages)
                 {
-                    WriteToFile($"{storage.Key}{separatorDict}{storage.Value.GetData(separatorDict, separatorData)}{Environment.NewLine}", fs);
+                    sw.Write($"{storage.Key}{separatorDict}{storage.Value.GetData(separatorDict, separatorData)}{Environment.NewLine}");
                 }
             }
             return true;
@@ -54,25 +48,17 @@ namespace Warship
             {
                 return false;
             }
-            string bufferTextFromFile = "";
+            using (StreamReader sr = new(filename))
-            using (FileStream fs = new(filename, FileMode.Open))
             {
-                byte[] b = new byte[fs.Length];
+                string str = "";
-                UTF8Encoding temp = new(true);
+                if ((str = sr.ReadLine()) == null || !str.Contains("MapsCollection"))
-                while (fs.Read(b, 0, b.Length) > 0)
-                {
-                    bufferTextFromFile += temp.GetString(b);
-                }
-            }
-            var strs = bufferTextFromFile.Split(new char[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries);
-            if (!strs[0].Contains("MapCollection"))
                 {
                     return false;
                 }
                 _mapStorages.Clear();
-            for(int i = 1; i < strs.Length; ++i)
+                while ((str = sr.ReadLine()) != null)
                 {
-                var elem = strs[i].Split(separatorDict);
+                    var elem = str.Split(separatorDict);
                     AbstractMap map = null;
                     switch (elem[1])
                     {
@@ -86,6 +72,7 @@ namespace Warship
                     _mapStorages.Add(elem[0], new MapWithSetWarshipsGeneric<IDrawingObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
                     _mapStorages[elem[0]].LoadData(elem[2].Split(separatorData, StringSplitOptions.RemoveEmptyEntries));
                 }
+            }
             return true;
         }
 
@@ -98,7 +85,7 @@ namespace Warship
             }
             else
             {
-                _mapStorages.Add(name, new MapWithSetWarshipsGeneric<DrawingObjectWarship, AbstractMap>(_pictureWidth, _pictureHeight, map));
+                _mapStorages.Add(name, new MapWithSetWarshipsGeneric<IDrawingObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
             }
         }
 
@@ -107,7 +94,7 @@ namespace Warship
                 _mapStorages.Remove(name);
         }
 
-        public MapWithSetWarshipsGeneric<DrawingObjectWarship, AbstractMap> this[string ind]
+        public MapWithSetWarshipsGeneric<IDrawingObject, AbstractMap> this[string ind]
         {
             get
             {