insideq/PIbd-11_Karakozov_AK_Simple
insideq/PIbd-11_Karakozov_AK_Simple
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIbd-11 Karakozov_AK LabWork08 Simple #8

Closed
insideq wants to merge 2 commits from LabWork08 into LabWork07
pull from: LabWork08
merge into: insideq:LabWork07
Conversation 0 Commits 2 Files Changed 13 +16 -11
5 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 12f8e6c828 - Show all commits

4
ProjectExcavator/ProjectExcavator/CollectionGenericObjects/ICollectionGenericObjects.cs
View File

@ -25,7 +25,7 @@ public interface ICollectionGenericObjects<T>
/// <param name="obj">Добавляемый объект</param>
/// <param name="comparer">Сравнение двух объектов</param>
/// <returns>true - вставка прошла успешно, false - вставка не удалась</returns>
int Insert(T obj, IEqualityComparer<DrawningBulldozer?>? comparer = null);
int Insert(T obj, IEqualityComparer<T?>? comparer = null);
/// <summary>
/// Добавление элемента в коллекцию на конкретную позицию
@ -34,7 +34,7 @@ public interface ICollectionGenericObjects<T>
/// <param name="position">Позиция</param>
/// <param name="comparer">Сравнение двух объектов</param>
/// <returns>true - вставка прошла успешно, false - вставка не удалась</returns>
int Insert(T obj, int position, IEqualityComparer<DrawningBulldozer?>? comparer = null);
int Insert(T obj, int position, IEqualityComparer<T?>? comparer = null);
/// <summary>
/// Удаление объекта из коллекции с конкретной позиции

8
ProjectExcavator/ProjectExcavator/CollectionGenericObjects/ListGenericObjects.cs
View File

@ -39,10 +39,10 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
return _collection[position];
}
public int Insert(T obj, IEqualityComparer<DrawningBulldozer?>? comparer = null)
public int Insert(T obj, IEqualityComparer<T?>? comparer = null)
{
// TODO выброс ошибки, если такой объект есть в коллекции
if (comparer != null && _collection.Contains(obj))
if (comparer != null && _collection.Contains(obj, comparer))
{
throw new CollectionAlreadyExistsException();
}
@ -56,10 +56,10 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
return _maxCount;
}
public int Insert(T obj, int position, IEqualityComparer<DrawningBulldozer?>? comparer = null)
public int Insert(T obj, int position, IEqualityComparer<T?>? comparer = null)
{
// TODO выброс ошибки, если такой объект есть в коллекции
if (comparer != null && _collection.Contains(obj))
if (comparer != null && _collection.Contains(obj, comparer))
{
throw new CollectionAlreadyExistsException();
}

8
ProjectExcavator/ProjectExcavator/CollectionGenericObjects/MassiveGenericObjects.cs
View File

@ -61,10 +61,10 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
return _collection[position];
}
public int Insert(T obj, IEqualityComparer<DrawningBulldozer?>? comparer = null)
public int Insert(T obj, IEqualityComparer<T?>? comparer = null)
{
// TODO выброс ошибки, если такой объект есть в коллекции
if (comparer != null && _collection.Contains(obj))
if (comparer != null && _collection.Contains(obj, comparer))
{
throw new CollectionAlreadyExistsException();
}
@ -82,11 +82,11 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
throw new CollectionOverflowException(Count);
}
public int Insert(T obj, int position, IEqualityComparer<DrawningBulldozer?>? comparer = null)
public int Insert(T obj, int position, IEqualityComparer<T?>? comparer = null)
{
// TODO выброс ошибки, если такой объект есть в коллекции
if (comparer != null && _collection.Contains(obj))
if (comparer != null && _collection.Contains(obj, comparer))
{
throw new CollectionAlreadyExistsException();
}

2
ProjectExcavator/ProjectExcavator/Exceptions/CollectionAlreadyExistsException.cs
View File

@ -10,7 +10,7 @@ namespace ProjectExcavator.Exceptions;
internal class CollectionAlreadyExistsException : ApplicationException
{
public CollectionAlreadyExistsException(CollectionInfo collectionInfo) : base("В коллекции уже есть такой элемент: " + collectionInfo) { }
public CollectionAlreadyExistsException() : base() { }
public CollectionAlreadyExistsException() : base("В коллекции уже есть такой элемент") { }
public CollectionAlreadyExistsException(string message) : base(message) { }
public CollectionAlreadyExistsException(string message, Exception exception) : base(message, exception) { }
protected CollectionAlreadyExistsException(SerializationInfo info, StreamingContext context) : base(info, context) { }

5
ProjectExcavator/ProjectExcavator/FormBulldozerCollection.cs
View File

@ -82,6 +82,11 @@ public partial class FormBulldozerCollection : Form
MessageBox.Show(ex.Message);
_logger.LogError("Ошибка: {Message}", ex.Message);
}
catch (CollectionAlreadyExistsException ex)
{
MessageBox.Show(ex.Message);
_logger.LogError("Ошибка: {Message}", ex.Message);
}
}
private void ButtonRemoveCar_Click(object sender, EventArgs e)