итоговые корректировки лабы 5

Sailboat/Sailboat/DrawingBoat.cs

@@ -144,20 +144,6 @@ namespace Sailboat.DrawingObjects
             g.DrawEllipse(pen, _startPosX + 20, _startPosY + 100, 90, 40);
 
         }
-        public void SetColor(Color color)
-        {
-            if (EntityBoat == null)
-            {
-                return;
-            }
-            EntityBoat.BodyColor = color;
-        }
-
-        public void ChangePictureBoxSize(int pictureBoxWidth, int pictureBoxHeight)
-        {
-            _pictureWidth = pictureBoxWidth;
-            _pictureHeight = pictureBoxHeight;
-        }
     }
 }
 

Sailboat/Sailboat/DrawingSailboat.cs

@@ -64,10 +64,5 @@ namespace Sailboat.DrawingObjects
                 g.DrawLine(pen, new Point(_startPosX + 65, _startPosY + 120), new Point(_startPosX + 65, _startPosY));
             }
         }
-
-        public void SetAddColor(Color color)
-        {
-            ((EntitySailboat)EntityBoat).AdditionalColor = color;
-        }
     }
 }

Sailboat/Sailboat/EntityBoat.cs

@@ -10,7 +10,8 @@ namespace Sailboat.Entities
     {
         public int Speed { get; private set; }
         public double Weight { get; private set; }
-        public Color BodyColor { get; set; }
+        public Color BodyColor { get; private set; }
+        public void setBodyColor(Color color) { BodyColor = color; }
         public double Step => (double)Speed * 100 / Weight;
         public EntityBoat(int speed, double weight, Color bodyColor)
         {

Sailboat/Sailboat/EntitySailboat.cs

@@ -8,7 +8,8 @@ namespace Sailboat.Entities
 {
     public class EntitySailboat : EntityBoat
     {
-        public Color AdditionalColor { get; set; }
+        public Color AdditionalColor { get; private set; }
+        public void setAdditionalColor(Color color) { AdditionalColor = color; }
         public bool Hull { get; private set; }
         public bool Sail { get; private set; }
         public EntitySailboat(int speed, double weight, Color bodyColor, Color

Sailboat/Sailboat/FormBoatConfig.cs

@@ -11,6 +11,7 @@ using System.Windows.Forms;
 using Sailboat.DrawingObjects;
 using Sailboat.Generics;
 using Sailboat.MovementStrategy;
+using Sailboat.Entities;
 
 namespace Sailboat
 {
@@ -100,12 +101,12 @@ namespace Sailboat
             switch (((Label)sender).Name)
             {
                 case "labelColor":
-                    _boat.SetColor((Color)e.Data.GetData(typeof(Color)));
+                    _boat.EntityBoat.setBodyColor((Color)e.Data.GetData(typeof(Color)));
                     break;
                 case "labelAddColor":
                     if (!(_boat is DrawingSailboat))
                         return;
-                    (_boat as DrawingSailboat).SetAddColor((Color)e.Data.GetData(typeof(Color)));
+                    (_boat.EntityBoat as EntitySailboat).setAdditionalColor((Color)e.Data.GetData(typeof(Color)));
                     break;
             }
             DrawBoat();