From 4ca174f9f320577102bab8a759771186c22f1933 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B0=D0=BB=D0=B5=D1=80=D0=B8=D1=8F=20=D0=9D=D0=B8?=
 =?UTF-8?q?=D0=BA=D0=B8=D1=84=D0=BE=D1=80=D0=BE=D0=B2=D0=B0?=
 <lera_nikiforova123@mail.ru>
Date: Tue, 4 Oct 2022 10:02:59 +0400
Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=20?=
 =?UTF-8?q?=D1=82=D0=B8=D0=BF=20=D0=B2=D0=BE=D0=B7=D0=B2=D1=80=D0=B0=D1=89?=
 =?UTF-8?q?=D0=B0=D0=B5=D0=BC=D0=BE=D0=B3=D0=BE=20=D0=B7=D0=BD=D0=B0=D1=87?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B4=D0=BB=D1=8F=20=D0=BE=D0=BF?=
 =?UTF-8?q?=D0=B5=D1=80=D0=B0=D1=86=D0=B8=D0=B9=20=D1=81=D0=BB=D0=BE=D0=B6?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B8=20=D0=B2=D1=8B=D1=87=D0=B8?=
 =?UTF-8?q?=D1=82=D0=B0=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AccordionBus/AccordionBus/FormMapWithSetBuses.cs |  4 ++--
 .../AccordionBus/MapWithSetBusesGeneric.cs       |  4 ++--
 AccordionBus/AccordionBus/SetBusesGeneric.cs     | 16 ++++++++--------
 3 files changed, 12 insertions(+), 12 deletions(-)

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
         /// <param name="map"></param>
         /// <param name="bus"></param>
         /// <returns></returns>
-        public static bool operator +(MapWithSetBusesGeneric<T, U> map, T bus)
+        public static int operator +(MapWithSetBusesGeneric<T, U> map, T bus)
         {
             return map._setBuses.Insert(bus);
         }
@@ -71,7 +71,7 @@ namespace AccordionBus
         /// <param name="map"></param>
         /// <param name="position"></param>
         /// <returns></returns>
-        public static bool operator -(MapWithSetBusesGeneric<T, U> map, int position)
+        public static int operator -(MapWithSetBusesGeneric<T, U> 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
         /// </summary>
         /// <param name="bus">Добавляемый автобус</param>
         /// <returns></returns>
-        public bool Insert(T bus)
+        public int Insert(T bus)
         {
             return Insert(bus, 0);
         }
@@ -44,12 +44,12 @@ namespace AccordionBus
         /// <param name="bus">Добавляемый автобус</param>
         /// <param name="position">Позиция</param>
         /// <returns></returns>
-        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;
         }
         /// <summary>
         /// Удаление объекта из набора с конкретной позиции
         /// </summary>
         /// <param name="position"></param>
         /// <returns></returns>
-        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;
         }
         /// <summary>
         /// Получение объекта из набора по позиции