борюсь с конфликтами

HoistingCrane/HoistingCrane/CollectionGenericObjects/AbstractCompany.cs

@@ -1,5 +1,4 @@
 using HoistingCrane.Drawning;
-using System;
 namespace HoistingCrane.CollectionGenericObjects
 {
     public abstract class AbstractCompany
@@ -31,7 +30,7 @@ namespace HoistingCrane.CollectionGenericObjects
         {
             get
             {
-                return (pictureWidth * pictureHeight) / (_placeSizeHeight * _placeSizeWidth);
+                return (pictureWidth * pictureHeight) / (_placeSizeHeight * _placeSizeWidth)-3;
             }
         }
         public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects<DrawningTrackedVehicle> array)
@@ -48,7 +47,7 @@ namespace HoistingCrane.CollectionGenericObjects
         }
         public static DrawningTrackedVehicle operator -(AbstractCompany company, int position)
         {
-            return company.arr?.Remove(position) ?? null;
+            return company.arr?.Remove(position);
         }
 
         public DrawningTrackedVehicle? GetRandomObject()
@@ -75,7 +74,6 @@ namespace HoistingCrane.CollectionGenericObjects
             }
             return bitmap;
         }
-
         /// <summary>
         /// Вывод заднего фона
         /// </summary>

HoistingCrane/HoistingCrane/CollectionGenericObjects/Garage.cs

@@ -1,7 +1,4 @@
 using HoistingCrane.Drawning;
-using System;
-using System.Collections.Specialized;
-
 namespace HoistingCrane.CollectionGenericObjects
 {
     public class Garage : AbstractCompany
@@ -23,7 +20,6 @@ namespace HoistingCrane.CollectionGenericObjects
                 }
             }
         }
-
         protected override void SetObjectsPosition()
         {
             int countWidth = pictureWidth / _placeSizeWidth;
@@ -54,5 +50,6 @@ namespace HoistingCrane.CollectionGenericObjects
 
             }
         }
+
     }
 }

HoistingCrane/HoistingCrane/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -1,5 +1,4 @@
-using System;
+namespace HoistingCrane.CollectionGenericObjects
-namespace HoistingCrane.CollectionGenericObjects
 {
     public interface ICollectionGenericObjects<T>
         where T: class

HoistingCrane/HoistingCrane/CollectionGenericObjects/ListGenericObjects.cs

@@ -1,5 +1,6 @@
 using System;
 using System.CodeDom.Compiler;
+using System.Windows.Forms.VisualStyles;
 
 namespace HoistingCrane.CollectionGenericObjects
 {
@@ -24,7 +25,6 @@ namespace HoistingCrane.CollectionGenericObjects
         {
             get { return list.Count; }
         }
-
         public int SetMaxCount 
         {
             set
@@ -38,16 +38,11 @@ namespace HoistingCrane.CollectionGenericObjects
 
         public T? Get(int position)
         {
-            // TODO проверка позиции
             if (position >= Count || position < 0) return null;
             return list[position];
         }
-
-
         public int Insert(T obj)
         {
-            // TODO проверка, что не превышено максимальное количество элементов
-            // TODO вставка в конец набора
             if (Count == _maxCount) 
             { 
                 return -1; 
@@ -58,9 +53,6 @@ namespace HoistingCrane.CollectionGenericObjects
 
         public int Insert(T obj, int position)
         {
-            // TODO проверка, что не превышено максимальное количество элементов
-            // TODO проверка позиции
-            // TODO вставка по позиции
             if (position < 0 || position >= Count || Count == _maxCount)
             {
                 return -1;
@@ -70,8 +62,6 @@ namespace HoistingCrane.CollectionGenericObjects
         }
         public T? Remove(int position)
         {
-            // TODO проверка позиции
-            // TODO удаление объекта из списка
             if(position >= 0 && position < list.Count)
             {
                 T? temp = list[position];

HoistingCrane/HoistingCrane/CollectionGenericObjects/MassivGenericObjects.cs

@@ -45,28 +45,33 @@ namespace HoistingCrane.CollectionGenericObjects
 
         public int Insert(T obj, int position)
         {
-            //todo Проверка позиции
+
-            if (position < 0 || position > Count)
+            if (position < 0 || position >= Count)
             {
                 return -1;
             }
 
+            int copyPos = position - 1;
+
+            while (position < Count)
+            {
                 if (arr[position] == null)
                 {
                     arr[position] = obj;
                     return position;
                 }
-            else
+                position++;
-            {
-                if (Insert(obj, position + 1) != -1)
-                {
-                    return position;
             }
-                if (Insert(obj, position - 1) != -1)
+            while (copyPos > 0)
             {
-                    return position;
+                if (arr[copyPos] == null)
+                {
+                    arr[copyPos] = obj;
+                    return copyPos;
                 }
+                copyPos--;
             }
+
             return -1;
         }
 

HoistingCrane/HoistingCrane/CollectionGenericObjects/StorageCollection.cs

@@ -25,17 +25,12 @@ namespace HoistingCrane.CollectionGenericObjects
         /// <param name="collectionType">тип коллекции</param>
         public void AddCollection(string name, CollectionType collectionType)
         {
-            if (!string.IsNullOrEmpty(name) && !Keys.Contains(name))
+            if (dict.ContainsKey(name)) return;
-            {
+            if (collectionType == CollectionType.None) return;
-                if(collectionType == CollectionType.Massive)
+            else if (collectionType == CollectionType.Massive)
-                {
+                dict[name] = new MassivGenericObjects<T>();
-                    dict.Add(name, new MassivGenericObjects<T> ());
+            else if (collectionType == CollectionType.List)
-                }
+                dict[name] = new ListGenericObjects<T>();
-                if(collectionType == CollectionType.List)
-                {
-                    dict.Add(name, new ListGenericObjects<T> ());
-                }
-            }
         }
         /// <summary>
         /// Удаление коллекции
@@ -43,9 +38,11 @@ namespace HoistingCrane.CollectionGenericObjects
         /// <param name="name">Название коллекции</param>
         public void DelCollection(string name)
         {
-            if (dict.ContainsKey(name))
+            if (Keys.Contains(name))
+            {
                 dict.Remove(name);
             }
+        }
         /// <summary>
         /// Доступ к коллекции
         /// </summary>
@@ -55,9 +52,11 @@ namespace HoistingCrane.CollectionGenericObjects
         {
             get
             {
-                if (name == null || !dict.ContainsKey(name)) { return null; }
+                if (dict.ContainsKey(name))
                     return dict[name];
+                return null;
             }
         }
+
     }
 }

HoistingCrane/HoistingCrane/MovementStrategy/AbstractStrategy.cs

@@ -47,7 +47,6 @@
             FieldWidth = width;
             FieldHeight = height;
         }
-
         /// <summary>
         /// Шаг перемещения
         /// </summary>
@@ -119,7 +118,6 @@
         /// </summary>
         /// <returns></returns>
         protected abstract bool IsTargetDestination();
-
         /// <summary>
         /// Попытка перемещения в требуемом направлении
         /// </summary>

HoistingCrane/HoistingCrane/MovementStrategy/MoveToBorder.cs

@@ -1,4 +1,6 @@
-namespace HoistingCrane.MovementStrategy
+using System.Configuration;
+
+namespace HoistingCrane.MovementStrategy
 {
     public class MoveToBorder : AbstractStrategy
     {
@@ -12,7 +14,6 @@
 
             return objParams.RightBorder + GetStep() >= FieldWidth && objParams.DownBorder + GetStep() >= FieldHeight;
         }
-
         protected override void MoveToTarget()
         {
             ObjectParameters? objParams = GetObjectParameters;