From 1460d8e2a0c1061cb3815910890116ae663418c6 Mon Sep 17 00:00:00 2001
From: IlyasValiulov <148232695+IlyasValiulov@users.noreply.github.com>
Date: Fri, 8 Mar 2024 15:05:41 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=B0=D1=80=D0=B0=D1=82?=
=?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
=?UTF-8?q?=D0=B0=20=E2=84=963=203?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../CollectionGenericObjects/AbstractCompany.cs | 2 +-
.../CollectionGenericObjects/ShipPortService.cs | 2 --
ProjectWarmlyShip/ProjectWarmlyShip/FormShipCollection.cs | 2 --
3 files changed, 1 insertion(+), 5 deletions(-)
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)