bulatova_karina/PIbd-22_Bulatova_K.R._WarmlyShip._BASE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

laba7: done

Browse Source
This commit is contained in:
bulatova_karina 2023-12-20 09:09:19 +03:00
parent 64d485870d
commit ad010d9102
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
WarmlyShip/WarmlyShip/FormShipCollection.cs
View File

@ -145,16 +145,19 @@ namespace WarmlyShip
_logger.LogWarning("Добавление пустого объекта");
return;
}
if (obj + drawingWarmlyShip)
try
{
MessageBox.Show("Объект добавлен");
pictureBoxCollection.Image = obj.ShowShips();
_logger.LogInformation($"Объект {obj.GetType()} добавлен");
if (obj + drawingWarmlyShip)
{
MessageBox.Show("Объект добавлен");
pictureBoxCollection.Image = obj.ShowShips();
_logger.LogInformation($"Объект {obj.GetType()} добавлен");
}
}
else
catch (StorageOverflowException ex)
{
MessageBox.Show("Не удалось добавить объект");
_logger.LogInformation($"Не удалось добавить объект");
MessageBox.Show(ex.Message);
_logger.LogWarning($"{ex.Message} в наборе {listBoxStorages.SelectedItem.ToString()}");
}
}

9
WarmlyShip/WarmlyShip/SetGeneric.cs
View File

@ -39,12 +39,7 @@ namespace WarmlyShip.Generics
/// <returns></returns>
public bool Insert(T warmlyship)
{
if (_places.Count == _maxCount)
{
return false;
}
Insert(warmlyship, 0);
return true;
return Insert(warmlyship, 0);
}
/// <summary>
/// Добавление объекта в набор на конкретную позицию
@ -57,7 +52,7 @@ namespace WarmlyShip.Generics
if (position < 0 || position >= _maxCount)
throw new ShipNotFoundException(position);
if (_places.Count >= _maxCount)
if (Count >= _maxCount)
throw new StorageOverflowException(_maxCount);
_places.Insert(0, warmlyship);
return true;