ZakenChannel/PI-12_Kuznetsov_D.V._Simple
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix throwing ObjectNotUniqueException and comparing objects

Browse Source
This commit is contained in:
ZakenChannel 2024-05-18 04:09:04 +04:00
parent e03badef02
commit 2421f27620
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ProjectAirFighter/ProjectAirFighter/CollectionGenericObjects/ListGenericObjects.cs
View File

@ -58,12 +58,9 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
public int Insert(T obj, IEqualityComparer<T?>? comparer) public int Insert(T obj, IEqualityComparer<T?>? comparer)
{ {
if (comparer == null) if (_collection.Contains(obj, comparer))
{ {
if (_collection.Contains(obj, comparer)) throw new ObjectNotUniqueException();
{
throw new ObjectNotUniqueException();
}
} }
if (Count == _maxCount) { throw new CollectionOverflowException(_collection.Count); } if (Count == _maxCount) { throw new CollectionOverflowException(_collection.Count); }
@ -74,12 +71,9 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
public int Insert(T obj, int position, IEqualityComparer<T?>? comparer) public int Insert(T obj, int position, IEqualityComparer<T?>? comparer)
{ {
if (comparer == null) if (_collection.Contains(obj, comparer))
{ {
if (_collection.Contains(obj, comparer)) throw new ObjectNotUniqueException(position);
{
throw new ObjectNotUniqueException();
}
} }
if (position < 0 || position >= Count) throw new PositionOutOfCollectionException(); if (position < 0 || position >= Count) throw new PositionOutOfCollectionException();
@ -87,7 +81,6 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
_collection.Insert(position, obj); _collection.Insert(position, obj);
return position; return position;
} }
public T Remove(int position) public T Remove(int position)

2
ProjectAirFighter/ProjectAirFighter/CollectionGenericObjects/MassiveGenericObjects.cs
View File

@ -90,7 +90,7 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
foreach (T? item in _collection) foreach (T? item in _collection)
{ {
if ((comparer as IEqualityComparer<DrawningWarPlane>).Equals(obj as DrawningWarPlane, item as DrawningWarPlane)) if ((comparer as IEqualityComparer<DrawningWarPlane>).Equals(obj as DrawningWarPlane, item as DrawningWarPlane))
throw new ObjectNotUniqueException(); throw new ObjectNotUniqueException(position);
} }
} }

1
ProjectAirFighter/ProjectAirFighter/Drawnings/DrawiningPlaneEqutables.cs
View File

@ -44,6 +44,7 @@ public class DrawiningPlaneEqutables : IEqualityComparer<DrawningWarPlane?>
{ {
EntityAirFighter _x = (EntityAirFighter) x.EntityFighter; EntityAirFighter _x = (EntityAirFighter) x.EntityFighter;
EntityAirFighter _y = (EntityAirFighter) x.EntityFighter; EntityAirFighter _y = (EntityAirFighter) x.EntityFighter;
if (_x.AdditionalColor != _y.AdditionalColor) if (_x.AdditionalColor != _y.AdditionalColor)
{ {
return false; return false;