diff --git a/DumpTruck/DumpTruck/EntityCar.cs b/DumpTruck/DumpTruck/EntityCar.cs index 15a890c..e8a4f66 100644 --- a/DumpTruck/DumpTruck/EntityCar.cs +++ b/DumpTruck/DumpTruck/EntityCar.cs @@ -42,10 +42,5 @@ namespace DumpTruck.Entities BodyColor = color; } - public override string ToString() - { - char _separatorForObject = ':'; - return $"{Speed}{_separatorForObject}{Weight}{_separatorForObject}{BodyColor.Name}"; - } } } diff --git a/DumpTruck/DumpTruck/EntityDumpTruck.cs b/DumpTruck/DumpTruck/EntityDumpTruck.cs index 88e686b..b6f232b 100644 --- a/DumpTruck/DumpTruck/EntityDumpTruck.cs +++ b/DumpTruck/DumpTruck/EntityDumpTruck.cs @@ -42,12 +42,6 @@ namespace DumpTruck.Entities AdditionalColor = color; } - public override string ToString() - { - char _separatorForObject = ':'; - return $"{base.ToString()}{_separatorForObject}{AdditionalColor.Name}" + - $"{_separatorForObject}{BodyKit}{_separatorForObject}{Tent}"; - } } } diff --git a/DumpTruck/DumpTruck/ExtentionDrawningCarDop.cs b/DumpTruck/DumpTruck/ExtentionDrawningCarDop.cs deleted file mode 100644 index 2cfc6d9..0000000 --- a/DumpTruck/DumpTruck/ExtentionDrawningCarDop.cs +++ /dev/null @@ -1,53 +0,0 @@ -using DumpTruck.DrawningObjects; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using DumpTruck.Entities; - -namespace DumpTruck -{ - public static class ExtentionDrawningCarDop - { - public static DrawningCar? CreateDrawningCarDop(this string info, char -separatorForObject, int width, int height) - { - string[] strs = info.Split(separatorForObject); - if (strs.Length == 3) - { - return new DrawningCar(Convert.ToInt32(strs[0]), - Convert.ToInt32(strs[1]), Color.FromName(strs[2]), width, height); - } - - if (strs.Length == 6) - { - return new DrawningDumpTruck(Convert.ToInt32(strs[0]), - Convert.ToInt32(strs[1]), - Color.FromName(strs[2]), - Color.FromName(strs[3]), - Convert.ToBoolean(strs[4]), - Convert.ToBoolean(strs[5]), width, height); - } - return null; - } - - public static string GetDataForSaveDop(this DrawningCar drawningCar, -char separatorForObject) - { - var car = drawningCar.EntityCar; - if (car == null) - { - return string.Empty; - } - var str = car.ToString(); - if (car is not EntityDumpTruck dumpTruck) - { - return str; - } - return car.ToString(); - - } - - } -}