diff --git a/AccordionBus/AccordionBus/FormMapWithSetBuses.cs b/AccordionBus/AccordionBus/FormMapWithSetBuses.cs index 2b38408..cdba42a 100644 --- a/AccordionBus/AccordionBus/FormMapWithSetBuses.cs +++ b/AccordionBus/AccordionBus/FormMapWithSetBuses.cs @@ -65,7 +65,7 @@ namespace AccordionBus if (form.ShowDialog() == DialogResult.OK) { DrawningObjectBus bus = new(form.SelectedBus); - if (form.SelectedBus == null || !(_mapBusesCollectionGeneric + bus)) + if (form.SelectedBus == null || (_mapBusesCollectionGeneric + bus == -1)) { MessageBox.Show("Не удалось добавить объект"); } @@ -92,7 +92,7 @@ namespace AccordionBus return; } int pos = Convert.ToInt32(maskedTextBoxPosition.Text); - if (_mapBusesCollectionGeneric - pos) + if (_mapBusesCollectionGeneric - pos != -1) { MessageBox.Show("Объект удален"); pictureBox.Image = _mapBusesCollectionGeneric.ShowSet(); diff --git a/AccordionBus/AccordionBus/MapWithSetBusesGeneric.cs b/AccordionBus/AccordionBus/MapWithSetBusesGeneric.cs index 76a2298..751f7b2 100644 --- a/AccordionBus/AccordionBus/MapWithSetBusesGeneric.cs +++ b/AccordionBus/AccordionBus/MapWithSetBusesGeneric.cs @@ -61,7 +61,7 @@ namespace AccordionBus /// /// /// - public static bool operator +(MapWithSetBusesGeneric map, T bus) + public static int operator +(MapWithSetBusesGeneric map, T bus) { return map._setBuses.Insert(bus); } @@ -71,7 +71,7 @@ namespace AccordionBus /// /// /// - public static bool operator -(MapWithSetBusesGeneric map, int position) + public static int operator -(MapWithSetBusesGeneric map, int position) { return map._setBuses.Remove(position); } diff --git a/AccordionBus/AccordionBus/SetBusesGeneric.cs b/AccordionBus/AccordionBus/SetBusesGeneric.cs index 17ae571..02c3c15 100644 --- a/AccordionBus/AccordionBus/SetBusesGeneric.cs +++ b/AccordionBus/AccordionBus/SetBusesGeneric.cs @@ -34,7 +34,7 @@ namespace AccordionBus /// /// Добавляемый автобус /// - public bool Insert(T bus) + public int Insert(T bus) { return Insert(bus, 0); } @@ -44,12 +44,12 @@ namespace AccordionBus /// Добавляемый автобус /// Позиция /// - public bool Insert(T bus, int position) + public int Insert(T bus, int position) { //проверка позиции if (position < 0 || position >= Count) { - return false; + return -1; } //поиск пустой позиции int positionEmpty = position; @@ -62,7 +62,7 @@ namespace AccordionBus } if (positionEmpty == Count) { - return false; + return -1; } //сдвиг вправо for (; positionEmpty > position; positionEmpty--) @@ -70,21 +70,21 @@ namespace AccordionBus _places[positionEmpty] = _places[positionEmpty - 1]; } _places[position] = bus; - return true; + return position; } /// /// Удаление объекта из набора с конкретной позиции /// /// /// - public bool Remove(int position) + public int Remove(int position) { if (position < 0 || position >= Count) { - return false; + return -1; } _places[position] = null; - return true; + return position; } /// /// Получение объекта из набора по позиции