diff --git a/ProjectWarmlyShip/ProjectWarmlyShip/CollectionGenericObjects/AbstractCompany.cs b/ProjectWarmlyShip/ProjectWarmlyShip/CollectionGenericObjects/AbstractCompany.cs index c7c30c6..013d334 100644 --- a/ProjectWarmlyShip/ProjectWarmlyShip/CollectionGenericObjects/AbstractCompany.cs +++ b/ProjectWarmlyShip/ProjectWarmlyShip/CollectionGenericObjects/AbstractCompany.cs @@ -23,7 +23,7 @@ public abstract class AbstractCompany /// /// Коллекция судов /// - public ICollectionGenericObjects? _collection = null; + protected ICollectionGenericObjects? _collection = null; /// /// Вычисление максимального количества элементов, который можно разместить в окне /// diff --git a/ProjectWarmlyShip/ProjectWarmlyShip/CollectionGenericObjects/ShipPortService.cs b/ProjectWarmlyShip/ProjectWarmlyShip/CollectionGenericObjects/ShipPortService.cs index 97f46c0..8180406 100644 --- a/ProjectWarmlyShip/ProjectWarmlyShip/CollectionGenericObjects/ShipPortService.cs +++ b/ProjectWarmlyShip/ProjectWarmlyShip/CollectionGenericObjects/ShipPortService.cs @@ -8,7 +8,6 @@ public class ShipPortService : AbstractCompany public ShipPortService(int picWidth, int picHeight, ICollectionGenericObjects collection) : base(picWidth, picHeight, collection) { } - protected override void DrawBackgound(Graphics g) { //рисуем пристань @@ -23,7 +22,6 @@ public class ShipPortService : AbstractCompany } } } - protected override void SetObjectsPosition() { int width = _pictureWidth / _placeSizeWidth; diff --git a/ProjectWarmlyShip/ProjectWarmlyShip/FormShipCollection.cs b/ProjectWarmlyShip/ProjectWarmlyShip/FormShipCollection.cs index e0ad221..e61d74c 100644 --- a/ProjectWarmlyShip/ProjectWarmlyShip/FormShipCollection.cs +++ b/ProjectWarmlyShip/ProjectWarmlyShip/FormShipCollection.cs @@ -67,12 +67,10 @@ public partial class FormShipCollection : Form { CreateObject(nameof(DrawningShip)); } - private void buttonAddWarmlyShip_Click(object sender, EventArgs e) { CreateObject(nameof(DrawningWarmlyShip)); } - private void buttonRemoveShip_Click(object sender, EventArgs e) { if (string.IsNullOrEmpty(maskedTextBox.Text) || _company == null)