diff --git a/ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/AutoParkService.cs b/ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/AutoParkService.cs index 3492c81..2632fa6 100644 --- a/ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/AutoParkService.cs +++ b/ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/AutoParkService.cs @@ -1,6 +1,4 @@ using ProjectCleaningCar.Drawning; -using ProjectCleaningCar.Entities; -using System.Drawing; namespace ProjectCleaningCar.CollectionGenericObjects; /// diff --git a/ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/MassiveGenericObjects.cs b/ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/MassiveGenericObjects.cs index d44b06e..a733aa5 100644 --- a/ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/MassiveGenericObjects.cs +++ b/ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/MassiveGenericObjects.cs @@ -1,5 +1,8 @@ namespace ProjectCleaningCar.CollectionGenericObjects; - +/// +/// Параметризованный набор объектов +/// +/// Параметр: ограничение - ссылочный тип public class MassiveGenericObjects : ICollectionGenericObjects where T : class { @@ -25,13 +28,15 @@ public class MassiveGenericObjects : ICollectionGenericObjects } } } + /// + /// Конструктор + /// public MassiveGenericObjects() { _collection = Array.Empty(); } public T? Get(int position) { - // TODO проверка позиции if (position < 0 || position >= Count) return null; return _collection[position]; } @@ -45,16 +50,10 @@ public class MassiveGenericObjects : ICollectionGenericObjects return i; } } - // TODO вставка в свободное место набора return -1; } public int Insert(T obj, int position) { - // TODO проверка позиции - // TODO проверка, что элемент массива по этой позиции пустой, если нет, то - // ищется свободное место после этой позиции и идет вставка туда - // если нет после, ищем до - // TODO вставка if (position >= Count || position < 0) return -1; if (_collection[position] == null) { @@ -85,8 +84,6 @@ public class MassiveGenericObjects : ICollectionGenericObjects } public T? Remove(int position) { - // TODO проверка позиции - // TODO удаление объекта из массива, присвоив элементу массива значение null if (position >= Count || position < 0) return null; T? myObject = _collection[position]; _collection[position] = null; diff --git a/ProjectCleaningCar/ProjectCleaningCar/FormCleaningCarCollection.cs b/ProjectCleaningCar/ProjectCleaningCar/FormCleaningCarCollection.cs index 1b2a24f..49938fb 100644 --- a/ProjectCleaningCar/ProjectCleaningCar/FormCleaningCarCollection.cs +++ b/ProjectCleaningCar/ProjectCleaningCar/FormCleaningCarCollection.cs @@ -64,7 +64,6 @@ public partial class FormCleaningCarCollection : Form random.Next(1000, 3000), GetColor(random)); break; case nameof(DrawningCleaningCar): - // TODO вызов диалогового окна для выбора цвета drawningTruck = new DrawningCleaningCar(random.Next(100, 300), random.Next(1000, 3000), GetColor(random), GetColor(random), Convert.ToBoolean(random.Next(0, 2)),