Igor_Gordeev/ISEbd-21.Gordeev.I.V.ElectricLocomotive.Basic
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WarningDell in Logs

Browse Source
This commit is contained in:
Игорь Гордеев 2023-12-18 19:56:44 +04:00
parent 7cfdcda5ed
commit 9b337df21c
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ElectricLocomotive/ElectricLocomotive/FormLocomotiveCollection.cs
View File

@ -145,8 +145,7 @@ namespace ElectricLocomotive
int pos = Convert.ToInt32(Input.Text); int pos = Convert.ToInt32(Input.Text);
try try
{ {
var removeObj = obj - pos; if ( obj - pos != null )
if (removeObj != null)
{ {
MessageBox.Show("Объект удален"); MessageBox.Show("Объект удален");
_logger.LogInformation($"Удален объект с позиции{pos}"); _logger.LogInformation($"Удален объект с позиции{pos}");
@ -155,6 +154,7 @@ namespace ElectricLocomotive
else else
{ {
MessageBox.Show("Не удалось удалить объект"); MessageBox.Show("Не удалось удалить объект");
_logger.LogWarning($"Не удалось удалить объект из набора {listBoxStorage.SelectedItem.ToString()}");
} }
} }
catch (LocoNotFoundException ex) catch (LocoNotFoundException ex)

14
ElectricLocomotive/ElectricLocomotive/SetGeneric.cs
View File

@ -36,16 +36,14 @@ namespace ProjectElectricLocomotive.Generics
_places.Insert(position, loco); _places.Insert(position, loco);
return position; return position;
} }
public T? Remove(int position) public bool Remove(int position)
{ {
if (position >= Count || position < 0) if (position < 0 || position >= _places.Count)
return null; {
T? tmp = _places[position];
if (tmp == null)
throw new LocoNotFoundException(position); throw new LocoNotFoundException(position);
_places[position] = null; }
return tmp; _places.RemoveAt(position);
return true;
} }
public T? this[int position] public T? this[int position]
{ {